OSDN Git Service
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""
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: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
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
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 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: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 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: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: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 [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: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
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: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
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>
Aravind Akella [Wed, 14 Oct 2015 21:20:00 +0000 (21:20 +0000)]
am
263b020b: am
6427e719: am
2ac7405b: Merge "Set DATA_INJECTION mode flag for sensors." into mnc-dr-dev
* commit '
263b020b6eb442aa0f82860b34f68ab3f5a3971a':
Set DATA_INJECTION mode flag for sensors.
Aravind Akella [Wed, 14 Oct 2015 21:13:41 +0000 (21:13 +0000)]
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.
Aravind Akella [Wed, 14 Oct 2015 21:08:15 +0000 (21:08 +0000)]
am
2ac7405b: Merge "Set DATA_INJECTION mode flag for sensors." into mnc-dr-dev
* commit '
2ac7405bda4f621f07cbcc0b562d16f7a9611c7b':
Set DATA_INJECTION mode flag for sensors.
Aravind Akella [Wed, 14 Oct 2015 21:03:07 +0000 (21:03 +0000)]
Merge "Set DATA_INJECTION mode flag for sensors." into mnc-dr-dev
Jesse Hall [Wed, 14 Oct 2015 20:30:38 +0000 (20:30 +0000)]
am
0983618f: am
a518d5ad: am
312d7555: egl: Remove window disconnect before calling driver eglDestroySurface
* commit '
0983618f0ad57b873163183eac6caf8dea7920c8':
egl: Remove window disconnect before calling driver eglDestroySurface
Jesse Hall [Wed, 14 Oct 2015 20:26:57 +0000 (20:26 +0000)]
am
a518d5ad: am
312d7555: egl: Remove window disconnect before calling driver eglDestroySurface
* commit '
a518d5ad0c0c6a661471a8cd2c962612943ca667':
egl: Remove window disconnect before calling driver eglDestroySurface
Jesse Hall [Wed, 14 Oct 2015 20:14:55 +0000 (20:14 +0000)]
am
312d7555: egl: Remove window disconnect before calling driver eglDestroySurface
* commit '
312d7555cb71ce7fb73bc758b9e30653e223b2f3':
egl: Remove window disconnect before calling driver eglDestroySurface
Jesse Hall [Wed, 14 Oct 2015 18:10:24 +0000 (11:10 -0700)]
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
Adam Lesinski [Tue, 13 Oct 2015 00:20:26 +0000 (00:20 +0000)]
am
5bba4236: am
76fc5f18: am
16b0ae10: Merge "add number constraint for samples per MotionEvent" into mnc-dr-dev
* commit '
5bba4236a86bbf4537bc27810803b9b224b0840f':
add number constraint for samples per MotionEvent
Adam Lesinski [Mon, 12 Oct 2015 22:30:10 +0000 (22:30 +0000)]
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
Adam Lesinski [Mon, 12 Oct 2015 22:23:05 +0000 (22:23 +0000)]
am
16b0ae10: Merge "add number constraint for samples per MotionEvent" into mnc-dr-dev
* commit '
16b0ae105e4e94ff09d1517b68f7c66f2022a19e':
add number constraint for samples per MotionEvent
Adam Lesinski [Mon, 12 Oct 2015 22:15:50 +0000 (22:15 +0000)]
Merge "add number constraint for samples per MotionEvent" into mnc-dr-dev
Flanker [Mon, 7 Sep 2015 07:28:58 +0000 (15:28 +0800)]
add number constraint for samples per MotionEvent
Bug:
23905002
Change-Id: Ifd24802977c3dcdd1dbc5120a78aac41beae4603
Signed-off-by: Adam Lesinski <adamlesinski@google.com>
Jason Parks [Mon, 12 Oct 2015 15:45:00 +0000 (15:45 +0000)]
am
7b2b968d: am
33c3c1bd: Merge "Revert "do not dumpstate raft BUG:
24159112"" into cw-e-dev
* commit '
7b2b968db484118668b70d040464f379a7e9e915':
Revert "do not dumpstate raft BUG:
24159112"
Jason Parks [Mon, 12 Oct 2015 15:39:58 +0000 (15:39 +0000)]
am
33c3c1bd: Merge "Revert "do not dumpstate raft BUG:
24159112"" into cw-e-dev
* commit '
33c3c1bd71de8a903b6a07f0b1c4f2f670313778':
Revert "do not dumpstate raft BUG:
24159112"
Jason Parks [Mon, 12 Oct 2015 15:34:47 +0000 (15:34 +0000)]
Merge "Revert "do not dumpstate raft BUG:
24159112"" into cw-e-dev
Jason Parks [Mon, 12 Oct 2015 15:27:10 +0000 (15:27 +0000)]
Revert "do not dumpstate raft BUG:
24159112"
This reverts commit
05c862252d5021f55a69281473c67d76e7097422.
Change-Id: Ib5984796734d2a0e33f47e0fb4e446b787e0d14f
Nick Kralevich [Sat, 10 Oct 2015 20:18:22 +0000 (20:18 +0000)]
am
c4db5ece: am
8e0c88ea: Merge "servicemanager: log pid and uid on selinux denial"
* commit '
c4db5ece1b34ada975041c167215d41a58f788ca':
servicemanager: log pid and uid on selinux denial
Mark Salyzyn [Sat, 10 Oct 2015 20:18:22 +0000 (20:18 +0000)]
am
ca78bbfd: am
52b25375: Merge "dumpstate: add -v printable to logcat"
* commit '
ca78bbfd85dcff3c635b813d1cbe882b576b433c':
dumpstate: add -v printable to logcat
Nick Kralevich [Sat, 10 Oct 2015 20:11:05 +0000 (20:11 +0000)]
am
8e0c88ea: Merge "servicemanager: log pid and uid on selinux denial"
* commit '
8e0c88ea489a7b395a3d349f81000fb2639bf448':
servicemanager: log pid and uid on selinux denial
Nick Kralevich [Sat, 10 Oct 2015 20:07:22 +0000 (20:07 +0000)]
Merge "servicemanager: log pid and uid on selinux denial"
Mark Salyzyn [Fri, 9 Oct 2015 21:25:32 +0000 (21:25 +0000)]
am
52b25375: Merge "dumpstate: add -v printable to logcat"
* commit '
52b2537550a6fc43587980887858c7e7150255b0':
dumpstate: add -v printable to logcat
Mark Salyzyn [Fri, 9 Oct 2015 21:20:05 +0000 (21:20 +0000)]
Merge "dumpstate: add -v printable to logcat"
Mark Salyzyn [Fri, 9 Oct 2015 21:02:07 +0000 (14:02 -0700)]
dumpstate: add -v printable to logcat
In the case where binary data lands in an utf-8 log buffer,
ensure that the content is made printable.
Bug:
23517551
Change-Id: I41696372d07228875d01a19f0c7ab2cb7494b7ef
Puneet Kumar [Thu, 8 Oct 2015 17:22:54 +0000 (17:22 +0000)]
am
98d740d7: am
94973aeb: am
a2f78b44: Merge "Inputflinger: hook up key event replacement processing" into mnc-dr-dev
* commit '
98d740d7d2546fae9887e5304d6a3afc8cadff8d':
Inputflinger: hook up key event replacement processing
Dmitry Torokhov [Thu, 8 Oct 2015 16:36:47 +0000 (09:36 -0700)]
resolved conflicts for
b9163905 to mnc-dr-dev-plus-aosp
Change-Id: I83afd79491533b1c7ae2aed50a927db175ba555f
Puneet Kumar [Thu, 8 Oct 2015 09:15:33 +0000 (09:15 +0000)]
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
Puneet Kumar [Thu, 8 Oct 2015 09:15:32 +0000 (09:15 +0000)]
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
Puneet Kumar [Thu, 8 Oct 2015 09:08:32 +0000 (09:08 +0000)]
am
a2f78b44: Merge "Inputflinger: hook up key event replacement processing" into mnc-dr-dev
* commit '
a2f78b44ee30839e2c047d07525dd6bc4fe50f1d':
Inputflinger: hook up key event replacement processing
Puneet Kumar [Thu, 8 Oct 2015 09:08:31 +0000 (09:08 +0000)]
am
2f3c3eb4: Merge "Allow defining replacement key events in keymap" into mnc-dr-dev
* commit '
2f3c3eb4e47d7cb6ef67e0fd2063e4b93e38e9ec':
Allow defining replacement key events in keymap
Puneet Kumar [Thu, 8 Oct 2015 08:16:58 +0000 (08:16 +0000)]
Merge "Inputflinger: hook up key event replacement processing" into mnc-dr-dev
Puneet Kumar [Thu, 8 Oct 2015 08:16:31 +0000 (08:16 +0000)]
Merge "Allow defining replacement key events in keymap" into mnc-dr-dev
Nick Kralevich [Thu, 8 Oct 2015 00:19:53 +0000 (00:19 +0000)]
am
ae0405d6: Merge "dumpstate: execute procrank using su"
* commit '
ae0405d607f9ed08d708ee990716a7881a6cfd4d':
dumpstate: execute procrank using su
Nick Kralevich [Thu, 8 Oct 2015 00:08:35 +0000 (00:08 +0000)]
Merge "dumpstate: execute procrank using su"
Nick Kralevich [Wed, 7 Oct 2015 23:38:42 +0000 (16:38 -0700)]
dumpstate: execute procrank using su
procrank is a setuid binary which only exists on userdebug/eng
builds. Instead of executing the setuid binary, run the binary using
the su command. This eliminates one more setuid binary, and allows
the tightening of the SELinux policy.
Bug:
18342188
Change-Id: I81d06196a29489feaefb2fea0cf5c4ff1e273d2f
William Roberts [Fri, 2 Oct 2015 05:02:15 +0000 (22:02 -0700)]
servicemanager: log pid and uid on selinux denial
The audit logs for servicemanager were missing the pid and uid of the source.
This is useful for debugging.
Before:
... SELinux : avc: denied { find } for service=android.security.keystore scontext=u:r:system_app:s0 ...
After:
... SELinux : avc: denied { find } for service=android.security.keystore pid=1252 uid=1000 scontext=u:r:system_app:s0 ...
Change-Id: Id1a6f38b99f11a31315439620ead2f01108b18b2
Signed-off-by: William Roberts <william.c.roberts@intel.com>
Erik Wolsheimer [Fri, 2 Oct 2015 17:43:26 +0000 (17:43 +0000)]
am
ddf5f250: am
05c86225: do not dumpstate raft BUG:
24159112
* commit '
ddf5f2509b48ee85dc352ee245f34a9d6307be39':
do not dumpstate raft BUG:
24159112
Erik Wolsheimer [Fri, 2 Oct 2015 17:37:05 +0000 (17:37 +0000)]
am
05c86225: do not dumpstate raft BUG:
24159112
* commit '
05c862252d5021f55a69281473c67d76e7097422':
do not dumpstate raft BUG:
24159112
OSDN Git Service
