OSDN Git Service
Casey Dahlin [Wed, 16 Nov 2016 18:46:43 +0000 (18:46 +0000)]
Merge "Fix integer overflow in unsafeReadTypedVector" into nyc-dev am:
e81a4f1518 am:
2dbc712abe am:
7be8fd60ea am:
5879e8e632
am:
233d223fed
Change-Id: Iacc9485dcccfff49d57b4808363dd761493bf6d2
Casey Dahlin [Wed, 16 Nov 2016 01:01:46 +0000 (17:01 -0800)]
resolve merge conflicts of
70b9a03 to nyc-mr2-dev-plus-aosp
Change-Id: If543d1c9f9ae22a2803e16d257531335b2995a96
Casey Dahlin [Wed, 16 Nov 2016 00:11:20 +0000 (00:11 +0000)]
Merge "Fix integer overflow in unsafeReadTypedVector" into nyc-dev am:
e81a4f1518 am:
2dbc712abe am:
7be8fd60ea
am:
5879e8e632
Change-Id: Iad5802baf7657e2f859e914500b7d2db1aec91e9
Casey Dahlin [Wed, 16 Nov 2016 00:11:07 +0000 (00:11 +0000)]
Fix integer overflow in unsafeReadTypedVector am:
65a8f07e57 am:
894ba10a5f am:
b7a1cc50d2
am:
5fef0c6d88
Change-Id: I1b75c83f3b2daaad30c42b0a3fed0add0cead5ee
Casey Dahlin [Wed, 16 Nov 2016 00:03:50 +0000 (00:03 +0000)]
Merge "Fix integer overflow in unsafeReadTypedVector" into nyc-dev am:
e81a4f1518 am:
2dbc712abe
am:
7be8fd60ea
Change-Id: Ic4a1d4bff81e892786296d3670559487f8d14070
Casey Dahlin [Wed, 16 Nov 2016 00:03:37 +0000 (00:03 +0000)]
Fix integer overflow in unsafeReadTypedVector am:
65a8f07e57 am:
894ba10a5f
am:
b7a1cc50d2
Change-Id: Id199d45df5b34f3415bf1754cb324bce6a7ed983
Casey Dahlin [Tue, 15 Nov 2016 23:57:19 +0000 (23:57 +0000)]
Merge "Fix integer overflow in unsafeReadTypedVector" into nyc-dev am:
e81a4f1518
am:
2dbc712abe
Change-Id: I14abc8f99e191328ac70176c90ba4f57e617a45e
Casey Dahlin [Tue, 15 Nov 2016 23:57:07 +0000 (23:57 +0000)]
Fix integer overflow in unsafeReadTypedVector am:
65a8f07e57
am:
894ba10a5f
Change-Id: If93da0dbcbf78ea65e3ac950c5539861587526bb
Casey Dahlin [Tue, 15 Nov 2016 23:49:37 +0000 (23:49 +0000)]
Merge "Fix integer overflow in unsafeReadTypedVector" into nyc-dev
am:
e81a4f1518
Change-Id: I0b6ed467fc45cf8d6d233730a5a3d4b6dd3eafa7
Casey Dahlin [Tue, 15 Nov 2016 23:49:36 +0000 (23:49 +0000)]
Fix integer overflow in unsafeReadTypedVector
am:
65a8f07e57
Change-Id: If37f6f01bfd8e7107063ce6993cf4c2b671fe99b
Casey Dahlin [Tue, 15 Nov 2016 23:40:20 +0000 (23:40 +0000)]
Merge "Fix integer overflow in unsafeReadTypedVector" into nyc-dev
Fabien Sanglard [Tue, 15 Nov 2016 01:58:24 +0000 (01:58 +0000)]
Fix SF security vulnerability:
32660278 am:
2d8a2432e0 am:
e5c91fe2e2 am:
9d14ab5409 am:
275b2347ef am:
aff7827b4f am:
c8684d517a am:
57dbf1c224 am:
b17adaa85f am:
c261a17e51 am:
ce40ad2441 am:
97ce922887
am:
f69a37981f
Change-Id: I84075320a494263410ba9454a8c1ec97fe5098f3
Fabien Sanglard [Tue, 15 Nov 2016 01:51:23 +0000 (01:51 +0000)]
Fix SF security vulnerability:
32660278 am:
2d8a2432e0 am:
e5c91fe2e2 am:
9d14ab5409 am:
275b2347ef am:
aff7827b4f am:
c8684d517a am:
57dbf1c224 am:
b17adaa85f am:
c261a17e51 am:
ce40ad2441
am:
97ce922887
Change-Id: I7b7bec42b2bb5d9b68e42681e599d1d979a298c1
Fabien Sanglard [Tue, 15 Nov 2016 01:44:23 +0000 (01:44 +0000)]
Fix SF security vulnerability:
32660278 am:
2d8a2432e0 am:
e5c91fe2e2 am:
9d14ab5409 am:
275b2347ef am:
aff7827b4f am:
c8684d517a am:
57dbf1c224 am:
b17adaa85f am:
c261a17e51
am:
ce40ad2441
Change-Id: Ia569c1b5841cf75626ae29e656688a405709ad79
Fabien Sanglard [Tue, 15 Nov 2016 01:44:23 +0000 (01:44 +0000)]
Fix SF security vulnerability:
32706020 am:
d073eb7a3f am:
230b943c6b am:
a928cc7169 am:
0517da2c5a am:
b0dff427a1 am:
1852db9aa3 am:
d4f7a66cf6 am:
0646227ad2
am:
b4bd9606e0
Change-Id: I738237f426b898a05cb9511dbc0a768e7cc00cdf
Fabien Sanglard [Tue, 15 Nov 2016 01:37:51 +0000 (01:37 +0000)]
Fix SF security vulnerability:
32660278 am:
2d8a2432e0 am:
e5c91fe2e2 am:
9d14ab5409 am:
275b2347ef am:
aff7827b4f am:
c8684d517a am:
57dbf1c224 am:
b17adaa85f
am:
c261a17e51
Change-Id: I8ef7a57b682596d4644bca2c8e5a7003d3125cca
Fabien Sanglard [Tue, 15 Nov 2016 01:37:23 +0000 (01:37 +0000)]
Fix SF security vulnerability:
32706020 am:
d073eb7a3f am:
230b943c6b am:
a928cc7169 am:
0517da2c5a am:
b0dff427a1 am:
1852db9aa3 am:
d4f7a66cf6
am:
0646227ad2
Change-Id: If15e3089b94f73cee3cb0a284b0a514cf433331b
Fabien Sanglard [Tue, 15 Nov 2016 01:31:22 +0000 (01:31 +0000)]
Fix SF security vulnerability:
32660278 am:
2d8a2432e0 am:
e5c91fe2e2 am:
9d14ab5409 am:
275b2347ef am:
aff7827b4f am:
c8684d517a am:
57dbf1c224
am:
b17adaa85f
Change-Id: I4259f7bbfafe66f7690c1ecd80f8c81a398ae78f
Fabien Sanglard [Tue, 15 Nov 2016 01:31:22 +0000 (01:31 +0000)]
Fix SF security vulnerability:
32706020 am:
d073eb7a3f am:
230b943c6b am:
a928cc7169 am:
0517da2c5a am:
b0dff427a1 am:
1852db9aa3
am:
d4f7a66cf6
Change-Id: I468e9387f0541fc22d71179ff6e05397f99e4dce
Fabien Sanglard [Tue, 15 Nov 2016 01:23:50 +0000 (01:23 +0000)]
Fix SF security vulnerability:
32660278 am:
2d8a2432e0 am:
e5c91fe2e2 am:
9d14ab5409 am:
275b2347ef am:
aff7827b4f am:
c8684d517a
am:
57dbf1c224
Change-Id: I5f91ea6e826a24d37bf8c7f7cbcc49a235532a14
Fabien Sanglard [Tue, 15 Nov 2016 01:23:50 +0000 (01:23 +0000)]
Fix SF security vulnerability:
32706020 am:
d073eb7a3f am:
230b943c6b am:
a928cc7169 am:
0517da2c5a am:
b0dff427a1
am:
1852db9aa3
Change-Id: Ief2e221eb25138131d4b9fe19b669dca26dd1726
Fabien Sanglard [Tue, 15 Nov 2016 01:17:50 +0000 (01:17 +0000)]
Fix SF security vulnerability:
32706020 am:
d073eb7a3f am:
230b943c6b am:
a928cc7169 am:
0517da2c5a
am:
b0dff427a1
Change-Id: If61fab86a971de18633549240d32f41205bc52e9
Fabien Sanglard [Tue, 15 Nov 2016 01:17:50 +0000 (01:17 +0000)]
Fix SF security vulnerability:
32660278 am:
2d8a2432e0 am:
e5c91fe2e2 am:
9d14ab5409 am:
275b2347ef am:
aff7827b4f
am:
c8684d517a
Change-Id: I7d37baee66a7a16cb77e227b66ba93bc87119810
Fabien Sanglard [Tue, 15 Nov 2016 01:10:20 +0000 (01:10 +0000)]
Fix SF security vulnerability:
32706020 am:
d073eb7a3f am:
230b943c6b am:
a928cc7169
am:
0517da2c5a
Change-Id: Ie25ecd20988d9aa8d3f59b07d00b80c0a18d5e3a
Fabien Sanglard [Tue, 15 Nov 2016 01:10:20 +0000 (01:10 +0000)]
Fix SF security vulnerability:
32660278 am:
2d8a2432e0 am:
e5c91fe2e2 am:
9d14ab5409 am:
275b2347ef
am:
aff7827b4f
Change-Id: I2a759e2ecdf1c67cb764a9279da23386cfb54914
Fabien Sanglard [Tue, 15 Nov 2016 01:02:50 +0000 (01:02 +0000)]
Fix SF security vulnerability:
32706020 am:
d073eb7a3f am:
230b943c6b
am:
a928cc7169
Change-Id: I682597ada156253e34ef067ae565d656c6bb39f7
Fabien Sanglard [Tue, 15 Nov 2016 01:02:49 +0000 (01:02 +0000)]
Fix SF security vulnerability:
32660278 am:
2d8a2432e0 am:
e5c91fe2e2 am:
9d14ab5409
am:
275b2347ef
Change-Id: Iae0109ec3bddd6f71bab1759003a34e75270f6d4
Fabien Sanglard [Tue, 15 Nov 2016 00:55:19 +0000 (00:55 +0000)]
Fix SF security vulnerability:
32706020 am:
d073eb7a3f
am:
230b943c6b
Change-Id: I439ff370c0a353bb9a0adc14a39aedd1ec5a783d
Fabien Sanglard [Tue, 15 Nov 2016 00:55:19 +0000 (00:55 +0000)]
Fix SF security vulnerability:
32660278 am:
2d8a2432e0 am:
e5c91fe2e2
am:
9d14ab5409
Change-Id: I0ed8d425157308f35b43818a9592267c06cdc807
Fabien Sanglard [Tue, 15 Nov 2016 00:47:19 +0000 (00:47 +0000)]
Fix SF security vulnerability:
32660278 am:
2d8a2432e0
am:
e5c91fe2e2
Change-Id: I0c2becbd05d41fae542a1c68b6f0f26b0f10a15a
Fabien Sanglard [Tue, 15 Nov 2016 00:47:18 +0000 (00:47 +0000)]
Fix SF security vulnerability:
32706020
am:
d073eb7a3f
Change-Id: I5b7bf4ecee39de868b9c275531a6f11e65d1c3fd
Fabien Sanglard [Tue, 15 Nov 2016 00:39:18 +0000 (00:39 +0000)]
Fix SF security vulnerability:
32660278
am:
2d8a2432e0
Change-Id: Ia5f419d7d113692f5d52b483f70ca09589333e13
Evgenii Stepanov [Mon, 14 Nov 2016 20:06:02 +0000 (20:06 +0000)]
Merge "Revert "Workaround alloc-dealloc-mismatch error on ASan device boot."" am:
5c58020c00 am:
22d12a89e6
am:
df48bcff26
Change-Id: If0ede202f577d8e1452c7905a4a06e7d36bce761
Evgenii Stepanov [Mon, 14 Nov 2016 19:58:48 +0000 (19:58 +0000)]
Merge "Revert "Workaround alloc-dealloc-mismatch error on ASan device boot."" am:
5c58020c00
am:
22d12a89e6
Change-Id: Ie392d157a320fba28e91214af4486d09d671a23a
Evgenii Stepanov [Mon, 14 Nov 2016 19:47:29 +0000 (19:47 +0000)]
Merge "Revert "Workaround alloc-dealloc-mismatch error on ASan device boot.""
am:
5c58020c00
Change-Id: I107ce2043fd261b08413418825daf6c35f808228
Evgenii Stepanov [Mon, 14 Nov 2016 19:26:48 +0000 (19:26 +0000)]
Merge "Revert "Workaround alloc-dealloc-mismatch error on ASan device boot.""
Nicolas Geoffray [Mon, 14 Nov 2016 09:48:44 +0000 (09:48 +0000)]
Merge "Revert "Revert "Pass --output-vdex-fd and input-vdex-fd to dex2oat.""" am:
eda1ddf518 am:
45cee75031
am:
8605678f48
Change-Id: I72d3a5583f8e1247c225335071ac64372a58c47b
Nicolas Geoffray [Mon, 14 Nov 2016 09:41:44 +0000 (09:41 +0000)]
Merge "Revert "Revert "Pass --output-vdex-fd and input-vdex-fd to dex2oat.""" am:
eda1ddf518
am:
45cee75031
Change-Id: Ife44a4f96470e4545a543d22448458b442a3bff7
Nicolas Geoffray [Mon, 14 Nov 2016 09:34:11 +0000 (09:34 +0000)]
Merge "Revert "Revert "Pass --output-vdex-fd and input-vdex-fd to dex2oat."""
am:
eda1ddf518
Change-Id: Idbc246744abd62d0bb647f569968457cf5b85583
Nicolas Geoffray [Mon, 14 Nov 2016 09:24:56 +0000 (09:24 +0000)]
Merge "Revert "Revert "Pass --output-vdex-fd and input-vdex-fd to dex2oat."""
Evgenii Stepanov [Wed, 14 Sep 2016 00:50:46 +0000 (00:50 +0000)]
Revert "Workaround alloc-dealloc-mismatch error on ASan device boot."
This reverts commit
22819276b147e34a80e8ca696be5b3fda68764b9.
The underlying kernel bug has been fixed.
Test: SANITIZE_TARGET=address build should continue working
Change-Id: I6f3938047d9f60357e7bd9bccd3ef36d7686c73b
Nicolas Geoffray [Thu, 10 Nov 2016 10:50:03 +0000 (10:50 +0000)]
Revert "Revert "Pass --output-vdex-fd and input-vdex-fd to dex2oat.""
Test: device boots, adb shell cmd package compile works.
This reverts commit
5373d3028d53df00c244802f89c8a31a8c1a55a6.
bug:
30937355
Change-Id: Iddab9cc8de866a281672fc3c509d43070c3f56de
Nicolas Geoffray [Wed, 9 Nov 2016 21:53:40 +0000 (21:53 +0000)]
Merge "Revert "Pass --output-vdex-fd and input-vdex-fd to dex2oat."" am:
80a4f63d7e am:
d5417da67b
am:
b741705b55
Change-Id: I7752cd4a894e08f189992afaf35bbbf8b92b1a7b
Nicolas Geoffray [Wed, 9 Nov 2016 21:48:10 +0000 (21:48 +0000)]
Merge "Revert "Pass --output-vdex-fd and input-vdex-fd to dex2oat."" am:
80a4f63d7e
am:
d5417da67b
Change-Id: I532508a618531080f687dfbf7818cd5ec11b3d9e
Nicolas Geoffray [Wed, 9 Nov 2016 21:42:08 +0000 (21:42 +0000)]
Merge "Revert "Pass --output-vdex-fd and input-vdex-fd to dex2oat.""
am:
80a4f63d7e
Change-Id: I02271ca0bbb3ee1d6eb5a8f73d6af0f23e0ab058
Nicolas Geoffray [Wed, 9 Nov 2016 21:32:14 +0000 (21:32 +0000)]
Merge "Revert "Pass --output-vdex-fd and input-vdex-fd to dex2oat.""
Nicolas Geoffray [Wed, 9 Nov 2016 21:30:54 +0000 (21:30 +0000)]
Revert "Pass --output-vdex-fd and input-vdex-fd to dex2oat."
Mishandled create_vdex_filename.
bug:
30937355
This reverts commit
196539e9ea6b096826c3489700588c286d8ca9c2.
Change-Id: Idd1a9f9567240899a103547a36dd036219f303cd
Fabien Sanglard [Tue, 8 Nov 2016 23:35:02 +0000 (15:35 -0800)]
Fix SF security vulnerability:
32706020
Because of lack of mutex lock when get mConsumerName, if one thread
getConsumerName, another thread setConsumerName frequently, an UAF will
be triggered.
Change-Id: Id1bbf0d15de6d16def2f54ecade385058cda3b65
Test: Marling with poc provided in bug report.
Bug:
32706020
Elliott Hughes [Wed, 9 Nov 2016 16:52:33 +0000 (16:52 +0000)]
Merge "Dumpstate's netstat call should use -W." am:
0708c8355f am:
ae4d6a6c8b
am:
7783703006
Change-Id: Ic37a4911434aa7bc2e1a9ed5dcf3fc1488c9776c
Elliott Hughes [Wed, 9 Nov 2016 16:46:04 +0000 (16:46 +0000)]
Merge "Dumpstate's netstat call should use -W." am:
0708c8355f
am:
ae4d6a6c8b
Change-Id: Ia44bef0d5dcb530ee17bcd7467f067ed1ef4b3cb
Elliott Hughes [Wed, 9 Nov 2016 16:40:02 +0000 (16:40 +0000)]
Merge "Dumpstate's netstat call should use -W."
am:
0708c8355f
Change-Id: If0d15f407cb5cd080950c414135a1ebcdf712d77
Elliott Hughes [Wed, 9 Nov 2016 16:30:31 +0000 (16:30 +0000)]
Merge "Dumpstate's netstat call should use -W."
Nicolas Geoffray [Wed, 9 Nov 2016 14:16:07 +0000 (14:16 +0000)]
Merge "Pass --output-vdex-fd and input-vdex-fd to dex2oat." am:
229d3c289b am:
6da66c1bf1
am:
eeb8729f9c
Change-Id: I9651b38c104dae1d26e306aefb683556f54aaf84
Nicolas Geoffray [Wed, 9 Nov 2016 14:10:35 +0000 (14:10 +0000)]
Merge "Pass --output-vdex-fd and input-vdex-fd to dex2oat." am:
229d3c289b
am:
6da66c1bf1
Change-Id: Id4b58e3f19f7a93e0947bda20fefb1015ae4c346
Nicolas Geoffray [Wed, 9 Nov 2016 14:04:35 +0000 (14:04 +0000)]
Merge "Pass --output-vdex-fd and input-vdex-fd to dex2oat."
am:
229d3c289b
Change-Id: Iab57ff0465b7e72b48c2d93b13e3930160a08704
Nicolas Geoffray [Wed, 9 Nov 2016 13:57:23 +0000 (13:57 +0000)]
Merge "Pass --output-vdex-fd and input-vdex-fd to dex2oat."
Fabien Sanglard [Tue, 8 Nov 2016 23:31:32 +0000 (15:31 -0800)]
Fix SF security vulnerability:
32660278
Because of lack of mutex lock when get mSidebandStream, if one thread
getSidebandStream, another thread setSidebandStream frequently, an UAF
will be triggered.
Bug:
32660278
Test: Marlin device with poc
Change-Id: Idbcf0976ce2db682d0f13455105c45a5c7481a45
Craig Donner [Tue, 8 Nov 2016 20:25:12 +0000 (20:25 +0000)]
Merge "Keep protected content in EGLImage attrs as needed." am:
5a03327fa8 am:
e86b7fb0cf
am:
54dd92287d
Change-Id: I8d7dd4c285303b4ae69e758feb7cebd6f4bafa65
Craig Donner [Tue, 8 Nov 2016 20:19:40 +0000 (20:19 +0000)]
Merge "Keep protected content in EGLImage attrs as needed." am:
5a03327fa8
am:
e86b7fb0cf
Change-Id: I6838c4f9c3885a0cc7e27355b5163c132e9f7b3e
Craig Donner [Tue, 8 Nov 2016 20:14:09 +0000 (20:14 +0000)]
Merge "Keep protected content in EGLImage attrs as needed."
am:
5a03327fa8
Change-Id: Id79a4a1548e5c7f4cb504d474f856727bf0b51ee
Treehugger Robot [Tue, 8 Nov 2016 20:06:32 +0000 (20:06 +0000)]
Merge "Keep protected content in EGLImage attrs as needed."
Nicolas Geoffray [Mon, 7 Nov 2016 16:24:05 +0000 (16:24 +0000)]
Pass --output-vdex-fd and input-vdex-fd to dex2oat.
Adjust to new dex2oat flags.
bug:
30937355
Test: device boots
Change-Id: Ieab2b2102a7b9c17b77618538608c47d8ad52e2d
Etan Cohen [Sun, 6 Nov 2016 03:29:53 +0000 (03:29 +0000)]
Merge "[NAN-AWARE] Rename NAN to Aware" am:
ab180e53b9 am:
3aa7f61eba
am:
53cb11bcdc
Change-Id: Iec7bfcf8d55a6735d43630686dc2e4a8b4d8c895
Etan Cohen [Sun, 6 Nov 2016 03:21:54 +0000 (03:21 +0000)]
Merge "[NAN-AWARE] Rename NAN to Aware" am:
ab180e53b9
am:
3aa7f61eba
Change-Id: I28cc8ef7a2589683fb16b9498ae1c2abfe2bf925
Etan Cohen [Sun, 6 Nov 2016 03:13:51 +0000 (03:13 +0000)]
Merge "[NAN-AWARE] Rename NAN to Aware"
am:
ab180e53b9
Change-Id: I75b3722f37d606e42effc9dee731210df958c7bd
Etan Cohen [Sun, 6 Nov 2016 03:05:39 +0000 (03:05 +0000)]
Merge "[NAN-AWARE] Rename NAN to Aware"
Etan Cohen [Wed, 26 Oct 2016 18:20:17 +0000 (11:20 -0700)]
[NAN-AWARE] Rename NAN to Aware
Rename only (and any reformatting needed to pass lint) - no
functional changes!
(cherry-pick of commit
49f8c84e1872c47716ebc2c04acdc8e3f6192734)
Bug:
32263750
Test: All unit tests and integration (sl4a) tests pass.
Merged-In: I00700206c90c9e6a1a0a2a79248dd571fe43ec26
Change-Id: I6b4b146a470ccbe081fb2f18d75e261a843978e2
liangweikang [Fri, 4 Nov 2016 01:54:04 +0000 (01:54 +0000)]
Merge "binder: print the bad cmd error to android log" am:
2e9ff8c5be am:
564e686168
am:
521f992ae8
Change-Id: I19ad71ec63036a6e4db2477cd6c2a2f75d975fc2
liangweikang [Fri, 4 Nov 2016 01:50:04 +0000 (01:50 +0000)]
Merge "binder: print the bad cmd error to android log" am:
2e9ff8c5be
am:
564e686168
Change-Id: Ic6de8bae8f3b138214785e856911d1eef6b4541b
liangweikang [Fri, 4 Nov 2016 01:46:34 +0000 (01:46 +0000)]
Merge "binder: print the bad cmd error to android log"
am:
2e9ff8c5be
Change-Id: I3849ae9043c52305798448b89cb82920a4ec13e4
Treehugger Robot [Fri, 4 Nov 2016 01:43:14 +0000 (01:43 +0000)]
Merge "binder: print the bad cmd error to android log"
Craig Donner [Thu, 20 Oct 2016 00:18:17 +0000 (17:18 -0700)]
Keep protected content in EGLImage attrs as needed.
When image_crop isn't supported, we also throw away the
protected_content_ext attrs in GLConsumer. Instead, keep them
around if they're used.
Bug:
32222880
Test: manual (cp from internal)
Change-Id: Ic182810cbaacdfaf912c57667f5176d3e47941a9
Dan Stoza [Thu, 3 Nov 2016 18:58:36 +0000 (18:58 +0000)]
SF: Request SF wakeup for pending transactions
am:
d9d1817e9a
Change-Id: I9d84ef9636acd4359dad908241bac0a5a560cd00
Dan Stoza [Wed, 2 Nov 2016 23:27:47 +0000 (16:27 -0700)]
SF: Request SF wakeup for pending transactions
When a Layer receives a pending transaction, it sets a flag on itself
that it needs a transaction to be handled, but it doesn't notify
SurfaceFlinger to iterate through the layers and check for that flag.
In some cases, this led to transactions never being processed, which
can hang an application trying to push buffers that are part of a
synchronized transaction. This change pokes SurfaceFlinger when setting
the Layer flag so that it doesn't slip through the cracks.
Bug:
32541494
Bug:
32629397
Test: Two successful monkey runs
Change-Id: I4b906eee8004fad1938aa94a1aa0a0c7ea289102
liangweikang [Tue, 25 Oct 2016 08:37:54 +0000 (16:37 +0800)]
binder: print the bad cmd error to android log
https://code.google.com/p/android/issues/detail?id=226068
Signed-off-by: liangweikang <liangweikang900911@gmail.com>
Jeff Sharkey [Mon, 31 Oct 2016 19:23:37 +0000 (19:23 +0000)]
Check and restorecon cache/code_cache directories. am:
397ec26675 am:
6437218b85
am:
c981bfb460
Change-Id: Iad65eeae8cdd82e86d62ecc8490046765c1f6b48
Jeff Sharkey [Mon, 31 Oct 2016 19:17:36 +0000 (19:17 +0000)]
Check and restorecon cache/code_cache directories. am:
397ec26675
am:
6437218b85
Change-Id: I5fed67126cbcb03ac946507eada3fd66ada6c266
Jeff Sharkey [Mon, 31 Oct 2016 19:11:06 +0000 (19:11 +0000)]
Check and restorecon cache/code_cache directories.
am:
397ec26675
Change-Id: Ifd0ffc94a328f75148c24ff4e266461855c38965
Jeff Sharkey [Mon, 31 Oct 2016 17:22:19 +0000 (11:22 -0600)]
Check and restorecon cache/code_cache directories.
To speed up boot times, we recently relaxed SELinux restorecon logic
to only consider relabeling app storage when the top level SELinux
label changed.
However, if an app manually deletes either their cache or code_cache
directories, installd will helpfully recreate those directories at
the next boot, but they'll be stuck with incorrect SELinux labels
which an app can't fix. (Our historically aggressive restorecons had
relabeled them, which is why we didn't observe until now.)
This change checks the labels of the cache/code_cache directories,
and runs a restorecon if needed, fixing the issue above.
Test: delete cache and verify recreated with correct label
Bug:
32504081
Change-Id: I0114ae4129223e5909b1075d56a9b1145ebc5ef4
Naveen Kalla [Fri, 28 Oct 2016 22:34:19 +0000 (22:34 +0000)]
Merge "DO NOT MERGE. Add modem logs to the bugreport" into nyc-mr2-dev
am:
2a221ffc01
Change-Id: I45a190ea17a413250c9d9ec9fab0a8e44696be2c
Naveen Kalla [Fri, 28 Oct 2016 22:22:47 +0000 (15:22 -0700)]
resolve merge conflicts of
de591df to nyc-mr2-dev-plus-aosp
Test: Resolved merge conflict and make sure change compiles
Change-Id: I341d3be774687f6cc62f9abb5998ebd6389d07ee
TreeHugger Robot [Fri, 28 Oct 2016 21:46:11 +0000 (21:46 +0000)]
Merge "DO NOT MERGE. Add modem logs to the bugreport" into nyc-mr2-dev
Elliott Hughes [Fri, 28 Oct 2016 15:53:02 +0000 (08:53 -0700)]
Dumpstate's netstat call should use -W.
IPv6 addresses (which are quite normal on a real device connected to a
mobile network) are truncated by netstat by default. (80 columns!)
Supplying -W says "I care about seeing the IP addresses more than I
care about fitting on a VT100".
Bug: noticed in bugreport in http://b/
32463933
Test: manual dumpstate run
Change-Id: I6f8b9ee258ceaa2beeca588fc95adb17fe07d0c4
Craig Donner [Fri, 28 Oct 2016 01:01:07 +0000 (01:01 +0000)]
Keep protected content in EGLImage attrs as needed.
am:
a94d940c75
Change-Id: I3376d949d387b4d0f70698b26dfd9f66755db88f
Naveen Kalla [Thu, 20 Oct 2016 04:38:44 +0000 (21:38 -0700)]
DO NOT MERGE. Add modem logs to the bugreport
When user takes bug report, collect modem logs and add it to the
bugreport zip file.
Test: Take Bugreport and ensure that the modem logs are present
in userdebug builds. Also check that bug reports are collected
normally if there are no modem logs.
BUG=
32219165
Change-Id: Ia20fc95ceee95972e17ac4193d350bbae36b3630
Wei Wang [Thu, 27 Oct 2016 18:24:35 +0000 (18:24 +0000)]
Merge "TextOutput log improvement" am:
3e9e757437 am:
1ccb872a9e
am:
1136e487b7
Change-Id: I29c8813ea1bcac32971925f53b277682ed2f948a
Wei Wang [Thu, 27 Oct 2016 18:19:05 +0000 (18:19 +0000)]
Merge "TextOutput log improvement" am:
3e9e757437
am:
1ccb872a9e
Change-Id: Ic9efec9193ed37c7bbfca966c07224b9e96349fb
Wei Wang [Thu, 27 Oct 2016 18:14:34 +0000 (18:14 +0000)]
Merge "TextOutput log improvement"
am:
3e9e757437
Change-Id: I88fec0002898ec7da19d579d0aa4679b73bfcd53
Connor O'Brien [Thu, 27 Oct 2016 18:09:33 +0000 (18:09 +0000)]
Merge "Enable multiple concurrent binderLibTest instances" am:
06d83ad741 am:
12a04a524b
am:
ea4dfd2f0d
Change-Id: I3485f6010a1090e4d709fb920b06b68a7d1cbb0a
Treehugger Robot [Thu, 27 Oct 2016 18:05:46 +0000 (18:05 +0000)]
Merge "TextOutput log improvement"
Connor O'Brien [Thu, 27 Oct 2016 18:05:03 +0000 (18:05 +0000)]
Merge "Enable multiple concurrent binderLibTest instances" am:
06d83ad741
am:
12a04a524b
Change-Id: I4f5d47d6d239d0df4b8e994645cd5bde4e45b88f
Connor O'Brien [Thu, 27 Oct 2016 18:00:33 +0000 (18:00 +0000)]
Merge "Enable multiple concurrent binderLibTest instances"
am:
06d83ad741
Change-Id: I4df9c55a81801972f1b4cbb56f11d24f5bbc9e1d
Connor O'Brien [Thu, 27 Oct 2016 17:54:14 +0000 (17:54 +0000)]
Merge "Enable multiple concurrent binderLibTest instances"
Craig Donner [Thu, 20 Oct 2016 00:18:17 +0000 (17:18 -0700)]
Keep protected content in EGLImage attrs as needed.
When image_crop isn't supported, we also throw away the
protected_content_ext attrs in GLConsumer. Instead, keep them
around if they're used.
Bug:
32222880
Change-Id: Ic182810cbaacdfaf912c57667f5176d3e47941a9
Connor O'Brien [Thu, 27 Oct 2016 00:58:51 +0000 (17:58 -0700)]
Enable multiple concurrent binderLibTest instances
Each instance tries to register a service with the
same name, so suffix the service name with the
instance's PID to avoid collisions.
Test: Tests run and pass in 2 processes at once
Change-Id: I685b01fbfbad4e9bd3eb6ea06f46ffc157169909
Signed-off-by: Connor O'Brien <connoro@google.com>
Casey Dahlin [Thu, 27 Oct 2016 00:18:25 +0000 (17:18 -0700)]
Fix integer overflow in unsafeReadTypedVector
Passing a size to std::vector that is too big causes it to silently
under-allocate when exceptions are disabled, leaving us open to an OOB
write. We check the bounds and the resulting size now to verify
allocation succeeds.
Test: Verified reproducer attached to bug no longer crashes Camera
service.
Bug:
31677614
Change-Id: I064b1442838032d93658f8bf63b7aa6d021c99b7
Ruben Brunk [Wed, 26 Oct 2016 00:31:07 +0000 (00:31 +0000)]
Merge "Do not set VR mode feature as handset default." into nyc-mr1-dev am:
4e1d67bd32 am:
323f83ef75
am:
4466e11fd4
Change-Id: I8577f7b46f6c53db78058c759fcfa0905ac73e8f
Ruben Brunk [Wed, 26 Oct 2016 00:30:52 +0000 (00:30 +0000)]
Do not set VR mode feature as handset default. am:
5ce292f55b am:
f0f8f0a99d
am:
f27cfdd82e
Change-Id: Ibe09a9e433ec8e18ce39d9369be3ce4e671a2e4d
Ruben Brunk [Wed, 26 Oct 2016 00:27:33 +0000 (00:27 +0000)]
Merge "Do not set VR mode feature as handset default." into nyc-mr1-dev am:
4e1d67bd32
am:
323f83ef75
Change-Id: I7f7ba9248fb860fb82522920d9befb443ebea88a
Ruben Brunk [Wed, 26 Oct 2016 00:27:21 +0000 (00:27 +0000)]
Do not set VR mode feature as handset default. am:
5ce292f55b
am:
f0f8f0a99d
Change-Id: I9c6f99532804546911f81b3e03faed63b652c00f
OSDN Git Service
