Adrian Roos
bcc709b94d
Merge changes from topic \'parcel-v2\' into mnc-dr-dev am: cf33d50d25
...
am: 0c11f9918c
2015-10-23 17:32:40 +00:00
Adrian Roos
0c11f9918c
Merge changes from topic \'parcel-v2\' into mnc-dr-dev
...
am: cf33d50d25
2015-10-23 17:28:42 +00:00
Adrian Roos
cf33d50d25
Merge changes from topic 'parcel-v2' into mnc-dr-dev
...
* changes:
Maintain Parcel ABI
Revert "Revert "Track ashmem memory usage in Parcel""
2015-10-23 17:21:23 +00:00
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
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
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
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
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
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
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
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
2015-10-23 02:02:42 +00:00
Nick Kralevich
9ec978732f
resolve merge conflicts of 834ac204ce to klp-modular-dev. am: 7f1ea80d65
...
am: fa632f6ad7
2015-10-23 01:52:34 +00:00
Nick Kralevich
fa632f6ad7
resolve merge conflicts of 834ac204ce to klp-modular-dev.
...
am: 7f1ea80d65
2015-10-23 01:44:26 +00:00
Adrian Roos
6bb3114246
Maintain Parcel ABI
...
Makes sure we don't change the memory layout of the Parcel class
to maintain binary compatibility with prebuilts linking against
libbinder.
Bug: 25004154
Change-Id: I656687497f08bb85cefda796aafa2341e601e30a
2015-10-22 17:48:16 -07:00
Adrian Roos
cbf3726357
Revert "Revert "Track ashmem memory usage in Parcel""
...
This reverts commit 6880307e8e
2015-10-22 17:47:27 -07: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
2015-10-22 22:33:58 +00:00
Ian Pedowitz
159a5c3372
Revert "Track ashmem memory usage in Parcel"
...
am: 6880307e8e
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
2015-10-22 22:28:01 +00:00
Ian Pedowitz
6880307e8e
Revert "Track ashmem memory usage in Parcel"
...
This reverts commit e2f499fb73
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
2015-10-22 02:15:13 +00:00
Flanker
90dc6dc825
add number constraint for samples per MotionEvent am: 5d17838ade am: 72c8ca4a01
...
am: 9964d83869
2015-10-22 02:10:12 +00:00
Flanker
9964d83869
add number constraint for samples per MotionEvent am: 5d17838ade
...
am: 72c8ca4a01
2015-10-22 02:04:55 +00:00
Flanker
72c8ca4a01
add number constraint for samples per MotionEvent
...
am: 5d17838ade
2015-10-22 02:02:46 +00:00
Adrian Roos
cb09f2c82f
Track ashmem memory usage in Parcel am: e2f499fb73
...
am: a0c1be2617
2015-10-22 00:52:32 +00:00
Adrian Roos
a0c1be2617
Track ashmem memory usage in Parcel
...
am: e2f499fb73
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
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
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
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
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
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
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
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
