ADHOC
/
replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
53,191 Commits 2 Branches 0 Tags 54 MiB
Commit Graph

53191 Commits

Author SHA1 Message Date
Nick Kralevich 69b8174c5e resolve merge conflicts of 834ac204ce to klp-modular-dev. am: 7f1ea80d65 am: fa632f6ad7 am: 9ec978732f am: 1b28b05d2e am: 0370a03b6e am: 18e7c64ea8 
am: 6eac97d4ba

* commit '6eac97d4baf77954c7d862e7bf35ed3763543491':
  DO NOT MERGE: fix build breakage
 2015-10-23 04:26:07 +00:00
Flanker cd9aad3a95 add number constraint for samples per MotionEvent am: 5d17838ade am: 72c8ca4a01 am: 9964d83869 am: 90dc6dc825 am: 9830f11dc6 am: a82ace99f7 am: 711c7becb0 
am: 928a4879e4

* commit '928a4879e4a2b996bccf007d390f7f2719e9a901':
  add number constraint for samples per MotionEvent
 2015-10-23 04:26:03 +00:00
Nick Kralevich 6eac97d4ba resolve merge conflicts of 834ac204ce to klp-modular-dev. am: 7f1ea80d65 am: fa632f6ad7 am: 9ec978732f am: 1b28b05d2e am: 0370a03b6e 
am: 18e7c64ea8

* commit '18e7c64ea82e002978ef069884d195e02e7302df':
  DO NOT MERGE: fix build breakage
 2015-10-23 04:23:35 +00:00
Flanker 928a4879e4 add number constraint for samples per MotionEvent am: 5d17838ade am: 72c8ca4a01 am: 9964d83869 am: 90dc6dc825 am: 9830f11dc6 am: a82ace99f7 
am: 711c7becb0

* commit '711c7becb01eec79d8335f335fab6e00a9164b00':
  add number constraint for samples per MotionEvent
 2015-10-23 04:23:24 +00:00
Nick Kralevich 18e7c64ea8 resolve merge conflicts of 834ac204ce to klp-modular-dev. am: 7f1ea80d65 am: fa632f6ad7 am: 9ec978732f am: 1b28b05d2e 
am: 0370a03b6e

* commit '0370a03b6e74e40d5110b83fed2243bf072aee73':
  DO NOT MERGE: fix build breakage
 2015-10-23 04:19:58 +00:00
Flanker 711c7becb0 add number constraint for samples per MotionEvent am: 5d17838ade am: 72c8ca4a01 am: 9964d83869 am: 90dc6dc825 am: 9830f11dc6 
am: a82ace99f7

* commit 'a82ace99f76ed815e16ab64eae2e9e55871a8b8f':
  add number constraint for samples per MotionEvent
 2015-10-23 04:19:51 +00:00
Nick Kralevich 0370a03b6e resolve merge conflicts of 834ac204ce to klp-modular-dev. am: 7f1ea80d65 am: fa632f6ad7 am: 9ec978732f 
am: 1b28b05d2e

* commit '1b28b05d2edf11f49717b53cd49a9161892f0388':
  DO NOT MERGE: fix build breakage
 2015-10-23 04:15:24 +00:00
Nick Kralevich 1b28b05d2e resolve merge conflicts of 834ac204ce to klp-modular-dev. am: 7f1ea80d65 am: fa632f6ad7 
am: 9ec978732f

* commit '9ec978732f8dd82e7adef3e37097eaca3fbd65f0':
  DO NOT MERGE: fix build breakage
 2015-10-23 02:02:42 +00:00
Nick Kralevich 9ec978732f resolve merge conflicts of 834ac204ce to klp-modular-dev. am: 7f1ea80d65 
am: fa632f6ad7

* commit 'fa632f6ad7be6b1f488dd3d1b825a82456db5097':
  DO NOT MERGE: fix build breakage
 2015-10-23 01:52:34 +00:00
Nick Kralevich fa632f6ad7 resolve merge conflicts of 834ac204ce to klp-modular-dev. 
am: 7f1ea80d65

* commit '7f1ea80d65996ab687ff56a884da915535cdc176':
  DO NOT MERGE: fix build breakage
 2015-10-23 01:44:26 +00:00
Nick Kralevich 7f1ea80d65 resolve merge conflicts of 834ac204ce to klp-modular-dev. 
Bug: 23905002
Change-Id: Ic7262861af91a8fff27692c0f68761cb3ab12aa3
 2015-10-22 17:26:28 -07:00
Ian Pedowitz 7a2643cd77 Revert "Track ashmem memory usage in Parcel" am: 6880307e8e 
am: 159a5c3372

* commit '159a5c337250613c166ae45b2811861f70c733bd':
  Revert "Track ashmem memory usage in Parcel"
 2015-10-22 22:33:58 +00:00
Ian Pedowitz 159a5c3372 Revert "Track ashmem memory usage in Parcel" 
am: 6880307e8e

* commit '6880307e8e35a6c484942443fb4ddd6173126152':
  Revert "Track ashmem memory usage in Parcel"
 2015-10-22 22:32:07 +00:00
Flanker a82ace99f7 add number constraint for samples per MotionEvent am: 5d17838ade am: 72c8ca4a01 am: 9964d83869 am: 90dc6dc825 
am: 9830f11dc6

* commit '9830f11dc6b6aa4001c79147966fdb9eaa71c2f2':
  add number constraint for samples per MotionEvent
 2015-10-22 22:28:01 +00:00
Ian Pedowitz 6880307e8e Revert "Track ashmem memory usage in Parcel" 
This reverts commit e2f499fb73.

Bug: 25169267
Bug: 25191602
Bug: 25004154
Change-Id: I24bb0da4e8739ee5a0c251e4adac9904827144e0
 2015-10-22 22:09:16 +00:00
Nick Kralevich 834ac204ce DO NOT MERGE: fix build breakage 
fix klp-dev only build breakage.

  frameworks/native/libs/input/Input.cpp: In member function 'android::status_t android::MotionEvent::readFromParcel(android::Parcel*)':
  frameworks/native/libs/input/Input.cpp:494:47: error: 'UINT16_MAX' was not declared in this scope

Bug: 23905002
Change-Id: I4b6b864ca64d39a8873d045a61e0ddaea2ab9109
 2015-10-22 07:09:23 -07:00
Flanker 9830f11dc6 add number constraint for samples per MotionEvent am: 5d17838ade am: 72c8ca4a01 am: 9964d83869 
am: 90dc6dc825

* commit '90dc6dc825ebd1f0f4c9474fad887cd7eac8e9bd':
  add number constraint for samples per MotionEvent
 2015-10-22 02:15:13 +00:00
Flanker 90dc6dc825 add number constraint for samples per MotionEvent am: 5d17838ade am: 72c8ca4a01 
am: 9964d83869

* commit '9964d83869565cf4dda432129cfe50f6ede19338':
  add number constraint for samples per MotionEvent
 2015-10-22 02:10:12 +00:00
Flanker 9964d83869 add number constraint for samples per MotionEvent am: 5d17838ade 
am: 72c8ca4a01

* commit '72c8ca4a0191827fd3265c0820b685a6cf420be1':
  add number constraint for samples per MotionEvent
 2015-10-22 02:04:55 +00:00
Flanker 72c8ca4a01 add number constraint for samples per MotionEvent 
am: 5d17838ade

* commit '5d17838adef13062717322e79d4db0b9bb6b2395':
  add number constraint for samples per MotionEvent
 2015-10-22 02:02:46 +00:00
Adrian Roos cb09f2c82f Track ashmem memory usage in Parcel am: e2f499fb73 
am: a0c1be2617

* commit 'a0c1be26177d554ef9c5d61b8a564bb03d402a04':
  Track ashmem memory usage in Parcel
 2015-10-22 00:52:32 +00:00
Adrian Roos a0c1be2617 Track ashmem memory usage in Parcel 
am: e2f499fb73

* commit 'e2f499fb734bc30a1e1c947112caa0727349b6ed':
  Track ashmem memory usage in Parcel
 2015-10-22 00:49:15 +00:00
Adrian Roos e2f499fb73 Track ashmem memory usage in Parcel 
Bug: 25004154
Change-Id: Id9d5656dd0605f1b50525596b75601309f67ebdc
 2015-10-21 22:32:35 +00:00
Flanker 5d17838ade add number constraint for samples per MotionEvent 
Bug:23905002

Signed-off-by: Adam Lesinski <adamlesinski@google.com>

(cherry picked from commit 552a8a5d8d)

Change-Id: I9b7ea859889b7697bee4165a2746602212120543
 2015-10-20 12:28:15 -07:00
Naveen Leekha 1d7b4fde4c am 18165848: am e2c4f4fb: am c1e6fbb5: Initialize local variables to avoid data leak am: 7534e4e63a -s ours am: 7b4863f606 am: 8121177b5e am: 7135d2768b 
am: 5957172a7e

* commit '5957172a7edb83d05423d5abae0091628f0c557c':
  Initialize local variables to avoid data leak
 2015-10-20 17:48:10 +00:00
Naveen Leekha 5957172a7e am 18165848: am e2c4f4fb: am c1e6fbb5: Initialize local variables to avoid data leak am: 7534e4e63a -s ours am: 7b4863f606 am: 8121177b5e 
am: 7135d2768b

* commit '7135d2768bcb46603735ab9b6b4bbaa788d39179':
  Initialize local variables to avoid data leak
 2015-10-20 17:25:55 +00:00
Naveen Leekha 7135d2768b am 18165848: am e2c4f4fb: am c1e6fbb5: Initialize local variables to avoid data leak am: 7534e4e63a -s ours am: 7b4863f606 
am: 8121177b5e

* commit '8121177b5e8c406570f0eaf6593c6fd1db232ddf':
  Initialize local variables to avoid data leak
 2015-10-20 17:02:33 +00:00
Naveen Leekha 8121177b5e am 18165848: am e2c4f4fb: am c1e6fbb5: Initialize local variables to avoid data leak am: 7534e4e63a -s ours 
am: 7b4863f606

* commit '7b4863f606bdb48b188b0235447dfaba6c8c3cf0':
  Initialize local variables to avoid data leak
 2015-10-20 16:54:09 +00:00
Naveen Leekha 7b4863f606 am 18165848: am e2c4f4fb: am c1e6fbb5: Initialize local variables to avoid data leak 
am: 7534e4e63a  -s ours

* commit '7534e4e63afedeb826a8d8a4b0cf3f9d40d243ea':
  Initialize local variables to avoid data leak
 2015-10-20 16:42:34 +00:00
Aravind Akella 263b020b6e am 6427e719: am 2ac7405b: Merge "Set DATA_INJECTION mode flag for sensors." into mnc-dr-dev 
* commit '6427e7190bbd83a29169e6ae4b5e3cff263f6937':
  Set DATA_INJECTION mode flag for sensors.
 2015-10-14 21:13:41 +00:00
Aravind Akella 6427e7190b am 2ac7405b: Merge "Set DATA_INJECTION mode flag for sensors." into mnc-dr-dev 
* commit '2ac7405bda4f621f07cbcc0b562d16f7a9611c7b':
  Set DATA_INJECTION mode flag for sensors.
 2015-10-14 21:08:15 +00:00
Aravind Akella 2ac7405bda Merge "Set DATA_INJECTION mode flag for sensors." into mnc-dr-dev 2015-10-14 21:03:07 +00:00
Jesse Hall 0983618f0a am a518d5ad: am 312d7555: egl: Remove window disconnect before calling driver eglDestroySurface 
* commit 'a518d5ad0c0c6a661471a8cd2c962612943ca667':
  egl: Remove window disconnect before calling driver eglDestroySurface
 2015-10-14 20:26:57 +00:00
Jesse Hall a518d5ad0c am 312d7555: egl: Remove window disconnect before calling driver eglDestroySurface 
* commit '312d7555cb71ce7fb73bc758b9e30653e223b2f3':
  egl: Remove window disconnect before calling driver eglDestroySurface
 2015-10-14 20:14:55 +00:00
Jesse Hall 312d7555cb egl: Remove window disconnect before calling driver eglDestroySurface 
This was originally added for b/14445579. An in-development app was
attempting to render to a window as an EGLSurface, then tear that
down, change some window properties, and create a new EGLSurface. The
second eglCreateWindowSurface failed because the window was already
connected. This change went in, but it turned out the real problem was
that the app still (unintentionally) had the surface current. After
the app bug was fixed, nobody revisited whether this change was
actually needed.

Turns out it wasn't needed. After an EGLSurface is both destroyed
*AND* not current (basically refcount==0), we were already
disconnecting the window in ~egl_surface_t().

Apart from being unnecessary and redundant, disconnecting the window
here is wrong for two reasons:

(a) The surface may still be in use after eglDestroySurface, if it was
still current. Rendering is undefined in that case, but disconnecting
the window leads to more catastrophic results than necessary.

(b) It's being called before calling the driver's eglDestroySurface.
The driver will almost definitely have a buffer dequeued that it needs
to cancel, and by disconnecting first we turn that into an error that
they don't have a graceful way to deal with.

Bug: 24524053
Change-Id: Ib063134413d25d3526f794aafb5e333e3417ea42
 2015-10-14 11:21:25 -07:00
Adam Lesinski 5bba4236a8 am 76fc5f18: am 16b0ae10: Merge "add number constraint for samples per MotionEvent" into mnc-dr-dev 
* commit '76fc5f18e6a0271a1f04db54924653faac73912e':
  add number constraint for samples per MotionEvent
 2015-10-12 22:30:10 +00:00
Adam Lesinski 76fc5f18e6 am 16b0ae10: Merge "add number constraint for samples per MotionEvent" into mnc-dr-dev 
* commit '16b0ae105e4e94ff09d1517b68f7c66f2022a19e':
  add number constraint for samples per MotionEvent
 2015-10-12 22:23:05 +00:00
Adam Lesinski 16b0ae105e Merge "add number constraint for samples per MotionEvent" into mnc-dr-dev 2015-10-12 22:15:50 +00:00
Flanker 552a8a5d8d add number constraint for samples per MotionEvent 
Bug:23905002
Change-Id: Ifd24802977c3dcdd1dbc5120a78aac41beae4603

Signed-off-by: Adam Lesinski <adamlesinski@google.com>
 2015-10-12 11:22:37 -07:00
Jason Parks 7b2b968db4 am 33c3c1bd: Merge "Revert "do not dumpstate raft BUG: 24159112"" into cw-e-dev 
* commit '33c3c1bd71de8a903b6a07f0b1c4f2f670313778':
  Revert "do not dumpstate raft BUG: 24159112"
 2015-10-12 15:39:58 +00:00
Jason Parks 33c3c1bd71 Merge "Revert "do not dumpstate raft BUG: 24159112"" into cw-e-dev 2015-10-12 15:34:47 +00:00
Jason Parks 31baf8d3c2 Revert "do not dumpstate raft BUG: 24159112" 
This reverts commit 05c862252d.

Change-Id: Ib5984796734d2a0e33f47e0fb4e446b787e0d14f
 2015-10-12 15:27:10 +00:00
Puneet Kumar 98d740d7d2 am 94973aeb: am a2f78b44: Merge "Inputflinger: hook up key event replacement processing" into mnc-dr-dev 
* commit '94973aeb1961c5a07a5288ec56c7f79ab658bb8d':
  Inputflinger: hook up key event replacement processing
 2015-10-08 09:15:33 +00:00
Puneet Kumar b916390540 am ec1323db: am 2f3c3eb4: Merge "Allow defining replacement key events in keymap" into mnc-dr-dev 
* commit 'ec1323dbd4558f9d4ff422c8547334fe13242ad0':
  Allow defining replacement key events in keymap
 2015-10-08 09:15:32 +00:00
Puneet Kumar 94973aeb19 am a2f78b44: Merge "Inputflinger: hook up key event replacement processing" into mnc-dr-dev 
* commit 'a2f78b44ee30839e2c047d07525dd6bc4fe50f1d':
  Inputflinger: hook up key event replacement processing
 2015-10-08 09:08:32 +00:00
Puneet Kumar ec1323dbd4 am 2f3c3eb4: Merge "Allow defining replacement key events in keymap" into mnc-dr-dev 
* commit '2f3c3eb4e47d7cb6ef67e0fd2063e4b93e38e9ec':
  Allow defining replacement key events in keymap
 2015-10-08 09:08:31 +00:00
Puneet Kumar a2f78b44ee Merge "Inputflinger: hook up key event replacement processing" into mnc-dr-dev 2015-10-08 08:16:58 +00:00
Puneet Kumar 2f3c3eb4e4 Merge "Allow defining replacement key events in keymap" into mnc-dr-dev 2015-10-08 08:16:31 +00:00
Erik Wolsheimer ddf5f2509b am 05c86225: do not dumpstate raft BUG: 24159112 
* commit '05c862252d5021f55a69281473c67d76e7097422':
  do not dumpstate raft BUG: 24159112
 2015-10-02 17:37:05 +00:00
Erik Wolsheimer 05c862252d do not dumpstate raft 
BUG: 24159112

Change-Id: I344aa73808992b5f84cb0536201a3ab2eb6f2b3c
 2015-10-02 10:02:24 -07:00