OSDN Git Service
Nick Kralevich [Fri, 23 Oct 2015 21:59:06 +0000 (21:59 +0000)]
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 am:
fd84a642ff
am:
354393ef75 -s ours
* commit '
354393ef75cdd25864f4d22ebba0c14163aedae4':
DO NOT MERGE: fix build try #2
Adrian Roos [Fri, 23 Oct 2015 21:59:01 +0000 (21:59 +0000)]
Merge changes from topic \'parcel-v2\' into mnc-dr-dev am:
cf33d50d25 am:
0c11f9918c am:
bcc709b94d
am:
0d2a22ece8
* commit '
0d2a22ece851b5ee358ac18214ccbfa28c3eb121':
Maintain Parcel ABI
Revert "Revert "Track ashmem memory usage in Parcel""
Nick Kralevich [Fri, 23 Oct 2015 21:49:23 +0000 (21:49 +0000)]
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
am:
fd84a642ff
* commit '
fd84a642ff1e6b30fe5c5adb623cc9e2addbb712':
DO NOT MERGE: fix build try #2
Adrian Roos [Fri, 23 Oct 2015 21:49:18 +0000 (21:49 +0000)]
Merge changes from topic \'parcel-v2\' into mnc-dr-dev am:
cf33d50d25 am:
0c11f9918c
am:
bcc709b94d
* commit '
bcc709b94d72e7f2d03d952dbf8a21b6980fd3a9':
Maintain Parcel ABI
Revert "Revert "Track ashmem memory usage in Parcel""
Nick Kralevich [Fri, 23 Oct 2015 21:40:03 +0000 (21:40 +0000)]
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
* commit '
5ce90247a20536091505b449a4d386c21034d842':
DO NOT MERGE: fix build try #2
Nick Kralevich [Fri, 23 Oct 2015 21:35:13 +0000 (21:35 +0000)]
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
* commit '
574145ea31171a80c45f86eb231f55a2106826c4':
DO NOT MERGE: fix build try #2
Nick Kralevich [Fri, 23 Oct 2015 21:22:14 +0000 (21:22 +0000)]
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
* commit '
bce101e79b5ee9715a8329db8fd760f7ba829de1':
DO NOT MERGE: fix build try #2
Adrian Roos [Thu, 22 Oct 2015 23:46:12 +0000 (16:46 -0700)]
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
(cherry picked from commit
6bb3114246f6f6aa406e65452dbaa12b135029ea)
Adrian Roos [Thu, 22 Oct 2015 23:12:53 +0000 (16:12 -0700)]
Revert "Revert "Track ashmem memory usage in Parcel""
This reverts commit
6880307e8e35a6c484942443fb4ddd6173126152.
Bug:
25004154
Change-Id: I9b432d1ebc39f3bbcd7afdefc403f0fb6ced8158
(cherry picked from commit
cbf3726357966539c2a685f46e61c3fc8937f19e)
Adrian Roos [Fri, 23 Oct 2015 17:32:40 +0000 (17:32 +0000)]
Merge changes from topic \'parcel-v2\' into mnc-dr-dev am:
cf33d50d25
am:
0c11f9918c
* commit '
0c11f9918c6f834f12d97315ef0247c08f8fef63':
Maintain Parcel ABI
Revert "Revert "Track ashmem memory usage in Parcel""
Adrian Roos [Fri, 23 Oct 2015 17:28:42 +0000 (17:28 +0000)]
Merge changes from topic \'parcel-v2\' into mnc-dr-dev
am:
cf33d50d25
* commit '
cf33d50d25c5660bf1d4325c11433fb281bc31cb':
Maintain Parcel ABI
Revert "Revert "Track ashmem memory usage in Parcel""
Adrian Roos [Fri, 23 Oct 2015 17:21:23 +0000 (17:21 +0000)]
Merge changes from topic 'parcel-v2' into mnc-dr-dev
* changes:
Maintain Parcel ABI
Revert "Revert "Track ashmem memory usage in Parcel""
Nick Kralevich [Fri, 23 Oct 2015 04:36:16 +0000 (04:36 +0000)]
DO NOT MERGE: fix build try #2 am:
778b6f4902 am:
034bc1799c -s ours am:
dbc9a47831 -s ours am:
a2685ebb1e
am:
1d94a1d036 -s ours
* commit '
1d94a1d036cb4bc8d9b178f56fa3bbddc81b7f10':
DO NOT MERGE: fix build try #2
Nick Kralevich [Fri, 23 Oct 2015 04:32:47 +0000 (04:32 +0000)]
Nick Kralevich [Fri, 23 Oct 2015 04:32:47 +0000 (04:32 +0000)]
DO NOT MERGE: fix build try #2 am:
778b6f4902 am:
034bc1799c -s ours am:
dbc9a47831 -s ours
am:
a2685ebb1e
* commit '
a2685ebb1ec5ed523fb4800d2593f2ae0c10ed22':
DO NOT MERGE: fix build try #2
Flanker [Fri, 23 Oct 2015 04:32:43 +0000 (04:32 +0000)]
add number constraint for samples per MotionEvent am:
5d17838ade am:
72c8ca4a01 am:
9964d83869 am:
90dc6dc825 am:
9830f11dc6 am:
a82ace99f7 am:
711c7becb0 am:
928a4879e4 am:
cd9aad3a95
am:
ce12ffb017
* commit '
ce12ffb0176f1ed42caf82ad07996c06f556a582':
add number constraint for samples per MotionEvent
Nick Kralevich [Fri, 23 Oct 2015 04:30:05 +0000 (04:30 +0000)]
resolve merge conflicts of
834ac204ce to klp-modular-dev. am:
7f1ea80d65 am:
fa632f6ad7 am:
9ec978732f am:
1b28b05d2e am:
0370a03b6e am:
18e7c64ea8 am:
6eac97d4ba
am:
69b8174c5e
* commit '
69b8174c5e184d0a314821d24893e931946ede83':
DO NOT MERGE: fix build breakage
Flanker [Fri, 23 Oct 2015 04:30:01 +0000 (04:30 +0000)]
add number constraint for samples per MotionEvent am:
5d17838ade am:
72c8ca4a01 am:
9964d83869 am:
90dc6dc825 am:
9830f11dc6 am:
a82ace99f7 am:
711c7becb0 am:
928a4879e4
am:
cd9aad3a95
* commit '
cd9aad3a95c1fbb3062abada8cb851a41e79556d':
add number constraint for samples per MotionEvent
Nick Kralevich [Fri, 23 Oct 2015 04:26:07 +0000 (04:26 +0000)]
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
Nick Kralevich [Fri, 23 Oct 2015 04:26:03 +0000 (04:26 +0000)]
DO NOT MERGE: fix build try #2 am:
778b6f4902 am:
034bc1799c -s ours
am:
dbc9a47831 -s ours
* commit '
dbc9a478311e8728c8148a80abb103fca697891d':
DO NOT MERGE: fix build try #2
Flanker [Fri, 23 Oct 2015 04:26:03 +0000 (04:26 +0000)]
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
Nick Kralevich [Fri, 23 Oct 2015 04:23:35 +0000 (04:23 +0000)]
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
Flanker [Fri, 23 Oct 2015 04:23:24 +0000 (04:23 +0000)]
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
Nick Kralevich [Fri, 23 Oct 2015 04:19:58 +0000 (04:19 +0000)]
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
Nick Kralevich [Fri, 23 Oct 2015 04:19:51 +0000 (04:19 +0000)]
DO NOT MERGE: fix build try #2 am:
778b6f4902
am:
034bc1799c -s ours
* commit '
034bc1799cbbc4184aa507eba181573c0a3b9b35':
DO NOT MERGE: fix build try #2
Flanker [Fri, 23 Oct 2015 04:19:51 +0000 (04:19 +0000)]
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
Nick Kralevich [Fri, 23 Oct 2015 04:15:24 +0000 (04:15 +0000)]
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
Nick Kralevich [Fri, 23 Oct 2015 04:15:21 +0000 (04:15 +0000)]
DO NOT MERGE: fix build try #2
am:
778b6f4902
* commit '
778b6f4902ad824d5fc62071caaa837bb47deee5':
DO NOT MERGE: fix build try #2
Nick Kralevich [Fri, 23 Oct 2015 02:02:42 +0000 (02:02 +0000)]
resolve merge conflicts of
834ac204ce to klp-modular-dev. am:
7f1ea80d65 am:
fa632f6ad7
am:
9ec978732f
* commit '
9ec978732f8dd82e7adef3e37097eaca3fbd65f0':
DO NOT MERGE: fix build breakage
Nick Kralevich [Fri, 23 Oct 2015 01:52:34 +0000 (01:52 +0000)]
resolve merge conflicts of
834ac204ce to klp-modular-dev. am:
7f1ea80d65
am:
fa632f6ad7
* commit '
fa632f6ad7be6b1f488dd3d1b825a82456db5097':
DO NOT MERGE: fix build breakage
Nick Kralevich [Fri, 23 Oct 2015 01:44:26 +0000 (01:44 +0000)]
resolve merge conflicts of
834ac204ce to klp-modular-dev.
am:
7f1ea80d65
* commit '
7f1ea80d65996ab687ff56a884da915535cdc176':
DO NOT MERGE: fix build breakage
Adrian Roos [Thu, 22 Oct 2015 23:46:12 +0000 (16:46 -0700)]
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
Adrian Roos [Thu, 22 Oct 2015 23:12:53 +0000 (16:12 -0700)]
Revert "Revert "Track ashmem memory usage in Parcel""
This reverts commit
6880307e8e35a6c484942443fb4ddd6173126152.
Bug:
25004154
Change-Id: I9b432d1ebc39f3bbcd7afdefc403f0fb6ced8158
Nick Kralevich [Fri, 23 Oct 2015 00:26:19 +0000 (17:26 -0700)]
resolve merge conflicts of
834ac204ce to klp-modular-dev.
Bug:
23905002
Change-Id: Ic7262861af91a8fff27692c0f68761cb3ab12aa3
Ian Pedowitz [Thu, 22 Oct 2015 22:41:13 +0000 (22:41 +0000)]
Revert "Track ashmem memory usage in Parcel" am:
6880307e8e am:
159a5c3372 am:
7a2643cd77
am:
f4ccbf8103
* commit '
f4ccbf8103dadabfc8e2eb01b582d9711f7d2931':
Revert "Track ashmem memory usage in Parcel"
Ian Pedowitz [Thu, 22 Oct 2015 22:38:23 +0000 (22:38 +0000)]
Revert "Track ashmem memory usage in Parcel" am:
6880307e8e am:
159a5c3372
am:
7a2643cd77
* commit '
7a2643cd77f1836844032f8a14f3c03a40c4e581':
Revert "Track ashmem memory usage in Parcel"
Ian Pedowitz [Thu, 22 Oct 2015 22:33:58 +0000 (22:33 +0000)]
Revert "Track ashmem memory usage in Parcel" am:
6880307e8e
am:
159a5c3372
* commit '
159a5c337250613c166ae45b2811861f70c733bd':
Revert "Track ashmem memory usage in Parcel"
Ian Pedowitz [Thu, 22 Oct 2015 22:32:07 +0000 (22:32 +0000)]
Revert "Track ashmem memory usage in Parcel"
am:
6880307e8e
* commit '
6880307e8e35a6c484942443fb4ddd6173126152':
Revert "Track ashmem memory usage in Parcel"
Flanker [Thu, 22 Oct 2015 22:28:01 +0000 (22:28 +0000)]
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
Ian Pedowitz [Thu, 22 Oct 2015 22:08:10 +0000 (22:08 +0000)]
Revert "Track ashmem memory usage in Parcel"
This reverts commit
e2f499fb734bc30a1e1c947112caa0727349b6ed.
Bug:
25169267
Bug:
25191602
Bug:
25004154
Change-Id: I24bb0da4e8739ee5a0c251e4adac9904827144e0
Nick Kralevich [Thu, 22 Oct 2015 21:48:50 +0000 (14:48 -0700)]
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
Pablo Ceballos [Thu, 22 Oct 2015 20:47:38 +0000 (20:47 +0000)]
Merge "Revert "Revert "Remove GLTrace support"""
Michael Wright [Thu, 22 Oct 2015 14:46:08 +0000 (14:46 +0000)]
Merge "Add new Cut / Copy / Paste keys"
Michael Wright [Thu, 22 Oct 2015 14:37:47 +0000 (14:37 +0000)]
Merge "Limit the number of keys read by KeyCharacterMaps."
Michael Wright [Wed, 21 Oct 2015 13:38:03 +0000 (14:38 +0100)]
Limit the number of keys read by KeyCharacterMaps.
Apps can send us a KCM containing a ridiculous key count, which will
cause us to crash when an allocation fails. Limit the key count so this
doesn't happen.
Bug:
24876135
Change-Id: I2bb4a5acabfc9184a867a406eef756c28c28f0ad
Nick Kralevich [Thu, 22 Oct 2015 14:09:23 +0000 (07:09 -0700)]
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
Flanker [Thu, 22 Oct 2015 02:15:13 +0000 (02:15 +0000)]
add number constraint for samples per MotionEvent am:
5d17838ade am:
72c8ca4a01 am:
9964d83869
am:
90dc6dc825
* commit '
90dc6dc825ebd1f0f4c9474fad887cd7eac8e9bd':
add number constraint for samples per MotionEvent
Flanker [Thu, 22 Oct 2015 02:10:12 +0000 (02:10 +0000)]
add number constraint for samples per MotionEvent am:
5d17838ade am:
72c8ca4a01
am:
9964d83869
* commit '
9964d83869565cf4dda432129cfe50f6ede19338':
add number constraint for samples per MotionEvent
Flanker [Thu, 22 Oct 2015 02:04:55 +0000 (02:04 +0000)]
add number constraint for samples per MotionEvent am:
5d17838ade
am:
72c8ca4a01
* commit '
72c8ca4a0191827fd3265c0820b685a6cf420be1':
add number constraint for samples per MotionEvent
Flanker [Thu, 22 Oct 2015 02:02:46 +0000 (02:02 +0000)]
add number constraint for samples per MotionEvent
am:
5d17838ade
* commit '
5d17838adef13062717322e79d4db0b9bb6b2395':
add number constraint for samples per MotionEvent
Daniel Erat [Thu, 22 Oct 2015 01:44:31 +0000 (01:44 +0000)]
Merge "libbinder: Stub out checkPermissions() on Brillo." am:
0d6d2917cb am:
0923d1017d
am:
ce0f028e07
* commit '
ce0f028e07a1659a29b188429dc8bcabf77ffc86':
libbinder: Stub out checkPermissions() on Brillo.
Daniel Erat [Thu, 22 Oct 2015 01:42:31 +0000 (01:42 +0000)]
Merge "libbinder: Stub out checkPermissions() on Brillo." am:
0d6d2917cb
am:
0923d1017d
* commit '
0923d1017daf3a56f19027d5ad10355301662455':
libbinder: Stub out checkPermissions() on Brillo.
Daniel Erat [Thu, 22 Oct 2015 01:40:35 +0000 (01:40 +0000)]
Merge "libbinder: Stub out checkPermissions() on Brillo."
am:
0d6d2917cb
* commit '
0d6d2917cb22ba09da632552c7074d3aa110fbdb':
libbinder: Stub out checkPermissions() on Brillo.
Daniel Erat [Thu, 22 Oct 2015 01:38:14 +0000 (01:38 +0000)]
Merge "libbinder: Stub out checkPermissions() on Brillo."
Daniel Erat [Tue, 13 Oct 2015 21:29:32 +0000 (15:29 -0600)]
libbinder: Stub out checkPermissions() on Brillo.
When BRILLO is defined at build-time, avoid checking
permissions with ActivityManager (which isn't built for
Brillo).
Bug:
24907738
Change-Id: I8e277fe45d73d551e3a8ab41bd9dfa2535967522
Adrian Roos [Thu, 22 Oct 2015 00:59:59 +0000 (00:59 +0000)]
Track ashmem memory usage in Parcel am:
e2f499fb73 am:
a0c1be2617 am:
cb09f2c82f
am:
b73f66ec1a
* commit '
b73f66ec1a31c5910c63fea199b222afb7c5a417':
Track ashmem memory usage in Parcel
Adrian Roos [Thu, 22 Oct 2015 00:55:46 +0000 (00:55 +0000)]
Track ashmem memory usage in Parcel am:
e2f499fb73 am:
a0c1be2617
am:
cb09f2c82f
* commit '
cb09f2c82fa202b3e4069b74ca103d8ba502c4c3':
Track ashmem memory usage in Parcel
Adrian Roos [Thu, 22 Oct 2015 00:52:32 +0000 (00:52 +0000)]
Track ashmem memory usage in Parcel am:
e2f499fb73
am:
a0c1be2617
* commit '
a0c1be26177d554ef9c5d61b8a564bb03d402a04':
Track ashmem memory usage in Parcel
Adrian Roos [Thu, 22 Oct 2015 00:49:15 +0000 (00:49 +0000)]
Track ashmem memory usage in Parcel
am:
e2f499fb73
* commit '
e2f499fb734bc30a1e1c947112caa0727349b6ed':
Track ashmem memory usage in Parcel
Adrian Roos [Thu, 22 Oct 2015 00:31:16 +0000 (00:31 +0000)]
Merge "Track ashmem memory usage in Parcel"
Adrian Roos [Wed, 21 Oct 2015 02:11:23 +0000 (19:11 -0700)]
Track ashmem memory usage in Parcel
Bug:
25004154
Change-Id: Id9d5656dd0605f1b50525596b75601309f67ebdc
Adrian Roos [Wed, 21 Oct 2015 02:11:23 +0000 (19:11 -0700)]
Track ashmem memory usage in Parcel
Bug:
25004154
Change-Id: Id9d5656dd0605f1b50525596b75601309f67ebdc
Dan Austin [Wed, 21 Oct 2015 20:06:20 +0000 (20:06 +0000)]
Merge "Fix benign integer overflow in printHexDump" am:
b36c7d0b6e am:
dd2ead5220
am:
cfde9e1de2
* commit '
cfde9e1de27372f2df26fa703019b8d156629cc3':
Fix benign integer overflow in printHexDump
Dan Austin [Wed, 21 Oct 2015 20:04:03 +0000 (20:04 +0000)]
Merge "Fix benign integer overflow in printHexDump" am:
b36c7d0b6e
am:
dd2ead5220
* commit '
dd2ead5220eb50e759e41b1b70e82085d20557bc':
Fix benign integer overflow in printHexDump
Dan Austin [Wed, 21 Oct 2015 20:01:45 +0000 (20:01 +0000)]
Merge "Fix benign integer overflow in printHexDump"
am:
b36c7d0b6e
* commit '
b36c7d0b6e793fae2d27b43d0022981c0d366d55':
Fix benign integer overflow in printHexDump
Dan Austin [Wed, 21 Oct 2015 19:53:56 +0000 (19:53 +0000)]
Merge "Fix benign integer overflow in printHexDump"
Dan Austin [Wed, 21 Oct 2015 18:28:59 +0000 (11:28 -0700)]
Fix benign integer overflow in printHexDump
There is an instance where an unsigned integer is multiplied by -1.
Refactor the code to eliminate this operation.
Bug:
25085348
Change-Id: I9c5dc1cc22a27dc998ae8eeacc9f889373d993cd
Michael Wright [Wed, 21 Oct 2015 17:09:02 +0000 (18:09 +0100)]
Add new Cut / Copy / Paste keys
Bug:
25120948
Change-Id: Ic2569b1d542fb3fd4159d8c08fe65beeb8b656d7
Casey Dahlin [Tue, 20 Oct 2015 23:59:41 +0000 (23:59 +0000)]
Merge "Fix build breakage due to extraneous dereference" am:
a763da3f1f am:
3a5841286c
am:
476ecb24db
* commit '
476ecb24dbf4492e27247be7c81f337d4da2de4c':
Fix build breakage due to extraneous dereference
Pablo Ceballos [Tue, 20 Oct 2015 23:57:53 +0000 (23:57 +0000)]
Revert "Revert "Remove GLTrace support""
This reverts commit
e6288e2660e9c310986bff7148fcfb745c13af9a.
Change-Id: Id50a7d471536150bb9e0393e159d66475aa4f473
Casey Dahlin [Tue, 20 Oct 2015 23:54:49 +0000 (23:54 +0000)]
Merge "Fix build breakage due to extraneous dereference" am:
a763da3f1f
am:
3a5841286c
* commit '
3a5841286c49d8944cee9e621fc971948c3f2cf3':
Fix build breakage due to extraneous dereference
Casey Dahlin [Tue, 20 Oct 2015 23:50:31 +0000 (23:50 +0000)]
Merge "Fix build breakage due to extraneous dereference"
am:
a763da3f1f
* commit '
a763da3f1fc010576b4807fa9b050c0720f81d00':
Fix build breakage due to extraneous dereference
Casey Dahlin [Tue, 20 Oct 2015 23:27:30 +0000 (23:27 +0000)]
Merge "Fix build breakage due to extraneous dereference"
Casey Dahlin [Tue, 20 Oct 2015 23:26:23 +0000 (16:26 -0700)]
Fix build breakage due to extraneous dereference
Change-Id: If84d8b68a6af1e04a6085351655e588ebef65664
Casey Dahlin [Tue, 20 Oct 2015 23:16:12 +0000 (23:16 +0000)]
Merge "Add read/write methods for vectors" am:
d83a34d8c7 am:
1dd0cbdb49
am:
29bf29d1aa
* commit '
29bf29d1aa9e0b467819519334d494ea4039af31':
Add read/write methods for vectors
Naveen Leekha [Tue, 20 Oct 2015 23:16:02 +0000 (23:16 +0000)]
Merge branch \'mnc-dr-dev-plus-aosp\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/native into mnc-dr-dev-plus-aosp
am:
1e7da8dfc6
* commit '
1e7da8dfc683ffdaf423c9f0c4faa3b41276b7c6':
Naveen Leekha [Tue, 20 Oct 2015 23:15:57 +0000 (23:15 +0000)]
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 am:
1d7b4fde4c
am:
91db803f0a
* commit '
91db803f0a0e7fb0445bf0193b6dcbe79e9df8fc':
Initialize local variables to avoid data leak
Casey Dahlin [Tue, 20 Oct 2015 23:11:53 +0000 (23:11 +0000)]
Merge "Add read/write methods for vectors" am:
d83a34d8c7
am:
1dd0cbdb49
* commit '
1dd0cbdb4957f675a2a6663bda89c6bfac95eb69':
Add read/write methods for vectors
Casey Dahlin [Tue, 20 Oct 2015 23:07:29 +0000 (23:07 +0000)]
Merge "Add read/write methods for vectors"
am:
d83a34d8c7
* commit '
d83a34d8c7fa4be9bd2fa3da4d3ca2c16febd651':
Add read/write methods for vectors
Casey Dahlin [Tue, 20 Oct 2015 23:00:12 +0000 (23:00 +0000)]
Merge "Add read/write methods for vectors"
Casey Dahlin [Tue, 20 Oct 2015 01:12:18 +0000 (18:12 -0700)]
Add read/write methods for vectors
Also a readString16 with the expected semantics.
Change-Id: Idbeaff1b4337089b2a5a7124f77226a693b2be4f
Test: Unit tests pass
Bug:
25012838
Signed-off-by: Casey Dahlin <sadmac@google.com>
Flanker [Mon, 7 Sep 2015 07:28:58 +0000 (15:28 +0800)]
add number constraint for samples per MotionEvent
Bug:
23905002
Signed-off-by: Adam Lesinski <adamlesinski@google.com>
(cherry picked from commit
552a8a5d8df32f659b8d11311a244cdc6d3b7733)
Change-Id: I9b7ea859889b7697bee4165a2746602212120543
Naveen Leekha [Tue, 20 Oct 2015 18:33:40 +0000 (18:33 +0000)]
Merge branch 'mnc-dr-dev-plus-aosp' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/native into mnc-dr-dev-plus-aosp
Naveen Leekha [Tue, 20 Oct 2015 18:33:36 +0000 (18:33 +0000)]
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
am:
1d7b4fde4c
* commit '
1d7b4fde4c7ae0bd5e8dd9a5177252cbfba85f1e':
Initialize local variables to avoid data leak
Naveen Leekha [Tue, 20 Oct 2015 18:30:05 +0000 (18:30 +0000)]
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
am:
1d7b4fde4c
* commit '
1d7b4fde4c7ae0bd5e8dd9a5177252cbfba85f1e':
Initialize local variables to avoid data leak
Naveen Leekha [Tue, 20 Oct 2015 17:48:10 +0000 (17:48 +0000)]
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
Naveen Leekha [Tue, 20 Oct 2015 17:25:55 +0000 (17:25 +0000)]
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
Naveen Leekha [Tue, 20 Oct 2015 17:02:33 +0000 (17:02 +0000)]
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
Naveen Leekha [Tue, 20 Oct 2015 16:54:09 +0000 (16:54 +0000)]
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
Naveen Leekha [Tue, 20 Oct 2015 16:42:34 +0000 (16:42 +0000)]
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
Pablo Ceballos [Mon, 19 Oct 2015 18:09:47 +0000 (18:09 +0000)]
Merge "Revert "Remove GLTrace support""
Pablo Ceballos [Mon, 19 Oct 2015 18:09:19 +0000 (18:09 +0000)]
Revert "Remove GLTrace support"
This reverts commit
5bf6f3b5bf06e04a742bde8d40409d3c9e434c05.
Change-Id: I25a2d9b4a4b219cb76b405db1f68997519361cd6
Pablo Ceballos [Mon, 19 Oct 2015 17:55:53 +0000 (17:55 +0000)]
Merge "Remove GLTrace support"
Casey Dahlin [Fri, 16 Oct 2015 20:45:04 +0000 (20:45 +0000)]
am
e313bf95: am
41c989aa: am
4e6d8c5b: Merge "Add methods to Parcel for bool and char and byte"
* commit '
e313bf9552745986fbc3a76d9176e7ec3727c725':
Add methods to Parcel for bool and char and byte
Casey Dahlin [Fri, 16 Oct 2015 20:37:02 +0000 (20:37 +0000)]
am
41c989aa: am
4e6d8c5b: Merge "Add methods to Parcel for bool and char and byte"
* commit '
41c989aa15c7a26aef4d2414137f9875fd22a161':
Add methods to Parcel for bool and char and byte
Casey Dahlin [Fri, 16 Oct 2015 20:30:50 +0000 (13:30 -0700)]
am
4e6d8c5b: Merge "Add methods to Parcel for bool and char and byte"
* commit '
4e6d8c5b9d51f11db7e8dbe91971c8b46beae5c0':
Add methods to Parcel for bool and char and byte
Casey Dahlin [Fri, 16 Oct 2015 20:13:00 +0000 (20:13 +0000)]
Merge "Add methods to Parcel for bool and char and byte"
Casey Dahlin [Thu, 15 Oct 2015 22:44:59 +0000 (15:44 -0700)]
Add methods to Parcel for bool and char and byte
We lift these to int, but handling the details of that here will be better
than having AIDL generate casting code all the time.
Test: unit tests pass
Bug:
24981507
Change-Id: If6aa33ab5fe365dd237136a95c5d9a702af41d15
Signed-off-by: Casey Dahlin <sadmac@google.com>
Dianne Hackborn [Thu, 15 Oct 2015 17:58:00 +0000 (17:58 +0000)]
Merge "Temporary hack to get rid of new virtuals."
Amirhossein Simjour [Thu, 15 Oct 2015 17:04:12 +0000 (17:04 +0000)]
Merge "When using trackpad, mouse pointer shows instead of circle"
OSDN Git Service
