Lajos Molnar
bc9bc0e0fc
Merge "OMX: clarify EOS signaling for tunneled decoders" into mnc-dev am: f1de4547c1 am: 37b8c1f77c
...
am: 8abb053a2e
2015-11-13 00:16:41 +00:00
Lajos Molnar
8abb053a2e
Merge "OMX: clarify EOS signaling for tunneled decoders" into mnc-dev am: f1de4547c1
...
am: 37b8c1f77c
2015-11-13 00:11:57 +00:00
Lajos Molnar
37b8c1f77c
Merge "OMX: clarify EOS signaling for tunneled decoders" into mnc-dev
...
am: f1de4547c1
2015-11-13 00:07:04 +00:00
Lajos Molnar
f1de4547c1
Merge "OMX: clarify EOS signaling for tunneled decoders" into mnc-dev
2015-11-13 00:00:19 +00:00
Peng Xu
e4db21f4b8
Merge "Avoiding flush on-change sensors at subscription" into mnc-dr-dev am: a78c2e65e1
...
am: ffb07f645e
2015-10-29 16:46:18 +00:00
Peng Xu
ffb07f645e
Merge "Avoiding flush on-change sensors at subscription" into mnc-dr-dev
...
am: a78c2e65e1
2015-10-27 22:31:50 +00:00
Peng Xu
a78c2e65e1
Merge "Avoiding flush on-change sensors at subscription" into mnc-dr-dev
2015-10-27 22:23:21 +00:00
Peng Xu
20483c4937
Avoiding flush on-change sensors at subscription
...
Initial sensor flush at subscription is a mechanism to avoid sensors
to get stale samples before subscription happens. However, there is a
slight chance that a most recent sample will be lost during the flush
process. This is OK for continuous sensors but problematic in
on-change sensor as on-change event does not come continuously and
a lost event can cause inconsistent state in client. Flush at
subscription of on-change sensor is disabled in this CL to avoid new
important on-change event to be discarded during the initial flush
process.
Bugs: b/24647069
b/25241873
b/24804819
Change-Id: Ibda099c6b9f5fb6e200f13cf13a850b0026e9e7c
2015-10-27 21:46:40 +00:00
Nick Kralevich
fd84a642ff
DO NOT MERGE: fix build try #2 am: 778b6f4902 am: 034bc1799c -s ours am: dbc9a47831 -s ours am: a2685ebb1e am: 1d94a1d036 -s ours am: bce101e79b am: 574145ea31
...
am: 5ce90247a2#2
2015-10-23 21:40:03 +00:00
Nick Kralevich
5ce90247a2
DO NOT MERGE: fix build try #2 am: 778b6f4902 am: 034bc1799c -s ours am: dbc9a47831 -s ours am: a2685ebb1e am: 1d94a1d036 -s ours am: bce101e79b
...
am: 574145ea31#2
2015-10-23 21:35:13 +00:00
Nick Kralevich
574145ea31
DO NOT MERGE: fix build try #2 am: 778b6f4902 am: 034bc1799c -s ours am: dbc9a47831 -s ours am: a2685ebb1e am: 1d94a1d036 -s ours
...
am: bce101e79b#2
2015-10-23 21:22:14 +00:00
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
bce101e79b
DO NOT MERGE: fix build try #2 am: 778b6f4902 am: 034bc1799c -s ours am: dbc9a47831 -s ours am: a2685ebb1e
...
am: 1d94a1d036#2
2015-10-23 04:36:16 +00:00
Nick Kralevich
1d94a1d036
DO NOT MERGE: fix build try #2 am: 778b6f4902 am: 034bc1799c -s ours am: dbc9a47831 -s ours
...
am: a2685ebb1e#2
2015-10-23 04:32:47 +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
Nick Kralevich
a2685ebb1e
DO NOT MERGE: fix build try #2 am: 778b6f4902 am: 034bc1799c -s ours
...
am: dbc9a47831#2
2015-10-23 04:26:03 +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
Nick Kralevich
dbc9a47831
DO NOT MERGE: fix build try #2 am: 778b6f4902
...
am: 034bc1799c#2
2015-10-23 04:19:51 +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
034bc1799c
DO NOT MERGE: fix build try #2
...
am: 778b6f4902#2
2015-10-23 04:15:21 +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
778b6f4902
DO NOT MERGE: fix build try #2
...
On klp-dev, UINT16_MAX isn't available unless __STDINT_LIMITS
is defined, which it's not for this code. This isn't relevant
for later branches due to bionic commit
e2a292d278b94fec3d078b1f1b27c1f89942c276
Don't use UINT16_MAX when we can just hardcode 65535.
Bug: 23905002
Change-Id: Ia1fd0f749cb7a4d19866075abc28ed6960424e54
2015-10-22 14:50:53 -07: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
