OSDN Git Service
Casey Dahlin [Thu, 1 Dec 2016 03:40:20 +0000 (03:40 +0000)]
Merge "Fix integer overflow in unsafeReadTypedVector" into nyc-dev am:
e81a4f1518 am:
2dbc712abe am:
7be8fd60ea
am:
5879e8e632
Change-Id: I361b7c6adb0326bf166ab574b234154985d11cc8
Casey Dahlin [Thu, 1 Dec 2016 02:18:20 +0000 (18:18 -0800)]
resolve merge conflicts of
5fef0c6 to nyc-mr1-dev-plus-aosp
Change-Id: I2362661ac567a1fe73b660499ecfb1a20f27c0db
Jinguang Dong [Wed, 30 Nov 2016 06:28:30 +0000 (06:28 +0000)]
Merge "surfaceflinger:Fix potential crash issue when do AIDL FUZZ test" am:
2792ff4527
am:
83f8bba2a5
Change-Id: Ie5a2b0f7cc37092618a7d35083cf53bf9f7f4212
Jinguang Dong [Wed, 30 Nov 2016 06:22:31 +0000 (06:22 +0000)]
Merge "surfaceflinger:Fix potential crash issue when do AIDL FUZZ test"
am:
2792ff4527
Change-Id: Ia8c1ac3f9eff3680ed64235cb01043d0b7c434b9
Treehugger Robot [Wed, 30 Nov 2016 06:11:21 +0000 (06:11 +0000)]
Merge "surfaceflinger:Fix potential crash issue when do AIDL FUZZ test"
Jinguang Dong [Tue, 29 Nov 2016 05:55:57 +0000 (13:55 +0800)]
surfaceflinger:Fix potential crash issue when do AIDL FUZZ
test
There will be trigger exception when we provide invalid
inputs parameter for surfaceflinger JNI interface
Test: 1.Run adb shell and open AIDLer tools;
2.change to Dir /sdcard/elong.AIDLer
3.run commond service list > service_list.txt
4.Rerun AIDL FUZZ test
Change-Id: I0a63adc1e8ae5d9c9e43cb6df6aa13503c40a0c5
Fabien Sanglard [Tue, 29 Nov 2016 07:36:58 +0000 (07:36 +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: I198eccaf1f86d250088edb48bd5ef3dcb4cebc00
Fabien Sanglard [Tue, 29 Nov 2016 07:36:41 +0000 (07:36 +0000)]
Fix SF security vulnerability:
32706020 am:
d073eb7a3f am:
230b943c6b am:
a928cc7169 am:
0517da2c5a am:
b0dff427a1 am:
1852db9aa3 am:
d4f7a66cf6
am:
0646227ad2
Change-Id: I8c2d45d95b205e32545f39f7ccf746b1707ca682
Jeff Sharkey [Tue, 29 Nov 2016 07:36:25 +0000 (07:36 +0000)]
Check and restorecon cache/code_cache directories. am:
397ec26675
am:
6437218b85
Change-Id: I947b61f97b8a8c53f9072a3a3900566d91b5c6e8
Ruben Brunk [Tue, 29 Nov 2016 07:35:58 +0000 (07:35 +0000)]
Merge "Do not set VR mode feature as handset default." into nyc-mr1-dev am:
4e1d67bd32
am:
323f83ef75
Change-Id: If4b5699338640018b9fbb2a636ad33e906404a78
Ruben Brunk [Tue, 29 Nov 2016 07:35:47 +0000 (07:35 +0000)]
Do not set VR mode feature as handset default. am:
5ce292f55b
am:
f0f8f0a99d
Change-Id: I9749d2c9ec2210771ca19a3bc0f7b50c3264be99
Steve Pfetsch [Tue, 29 Nov 2016 07:35:02 +0000 (07:35 +0000)]
Merge "Revert "services: surfaceflinger: ASAN fix"" into nyc-mr1-dev am:
103ba31665
am:
b3f571bc1e
Change-Id: I065826c95fd835e79ed90dda6cbe8086624eb1a4
Steve Pfetsch [Tue, 29 Nov 2016 07:34:47 +0000 (07:34 +0000)]
Revert "services: surfaceflinger: ASAN fix" am:
598f6d5429
am:
d5156b70ff
Change-Id: I87e368e8ee4770d02fbe75a031f01ff163e0c372
Felipe Leme [Tue, 29 Nov 2016 07:34:33 +0000 (07:34 +0000)]
Merge "DO NOT MERGE. Revert "Dumpstate should hold a wakelock to save bug report time."" into nyc-mr1-dev am:
7781eccbc3
am:
dca861e167
Change-Id: I19219da414ef75e519c5a03f8590ff5cabcc9b71
Felipe Leme [Mon, 28 Nov 2016 22:29:38 +0000 (14:29 -0800)]
resolve merge conflicts of
dfc9df4 to nyc-mr1-dev-plus-aosp
Change-Id: I5da1f949bc1edb7dae110f3ab2a7328f9b1b02e9
Nicolas Geoffray [Mon, 28 Nov 2016 13:33:11 +0000 (13:33 +0000)]
Merge "Adjust installd with new dexopt return values." am:
b29c82b67e
am:
f118868549
Change-Id: I663a65ac5070782052a2a8676bc1df14074a49bb
Nicolas Geoffray [Mon, 28 Nov 2016 13:25:26 +0000 (13:25 +0000)]
Merge "Adjust installd with new dexopt return values."
am:
b29c82b67e
Change-Id: Ib0f3811c5891d6871d7b9d44c615954b06f261c6
Nicolas Geoffray [Mon, 28 Nov 2016 13:15:55 +0000 (13:15 +0000)]
Merge "Adjust installd with new dexopt return values."
Nicolas Geoffray [Fri, 25 Nov 2016 11:33:31 +0000 (11:33 +0000)]
Adjust installd with new dexopt return values.
Bug:
30937355
Test: device boots, mimic system update, apps get updated.
Change-Id: I9539892dfcdd0cc722a292140accd7525ee132d0
Manoj Gupta [Wed, 23 Nov 2016 06:44:06 +0000 (06:44 +0000)]
Merge "Fix clang static analyzer warnings." am:
b10d705f51
am:
87b2535ff8
Change-Id: I24784df53a0574974f822ee01e2a1f13729176c5
Manoj Gupta [Wed, 23 Nov 2016 06:40:36 +0000 (06:40 +0000)]
Merge "Fix clang static analyzer warnings."
am:
b10d705f51
Change-Id: Ibdd7df4af9766b5d00515254cbb8d5e9370a4971
Treehugger Robot [Wed, 23 Nov 2016 06:35:32 +0000 (06:35 +0000)]
Merge "Fix clang static analyzer warnings."
Martijn Coenen [Tue, 22 Nov 2016 09:55:14 +0000 (09:55 +0000)]
Merge "atrace: support HAL services as well." am:
1aea108920
am:
7d7cd0cc88
Change-Id: I52a8b3ffcc4bea2b2adb290de6a989b225f447e4
Martijn Coenen [Tue, 22 Nov 2016 09:49:27 +0000 (09:49 +0000)]
Merge "atrace: support HAL services as well."
am:
1aea108920
Change-Id: Iac0430699cd15f59ed68b41d20010165a50a50e2
Treehugger Robot [Tue, 22 Nov 2016 09:43:23 +0000 (09:43 +0000)]
Merge "atrace: support HAL services as well."
Martijn Coenen [Wed, 16 Nov 2016 15:00:26 +0000 (16:00 +0100)]
atrace: support HAL services as well.
Also poke services that are only registered with
hwbinder, so that they update their props (trace
categories) immediately.
Bug:
31262344
Test: builds, atrace works
Change-Id: I355ddd5f950acc27d598cd972e63f9711426b943
Wei Wang [Sun, 20 Nov 2016 16:31:01 +0000 (16:31 +0000)]
Merge "atrace.rc: move to post-fs trigger" am:
3749a60b42
am:
5b30ae185e
Change-Id: Ibb5370034f45a00e1ec9166abc4a66afc32b4847
Wei Wang [Sun, 20 Nov 2016 16:26:31 +0000 (16:26 +0000)]
Merge "atrace.rc: move to post-fs trigger"
am:
3749a60b42
Change-Id: Ib2675cf4047d6ce1b9b6285538bb7f7be7ed1649
Treehugger Robot [Sun, 20 Nov 2016 16:22:22 +0000 (16:22 +0000)]
Merge "atrace.rc: move to post-fs trigger"
Wei Wang [Sun, 20 Nov 2016 04:49:09 +0000 (20:49 -0800)]
atrace.rc: move to post-fs trigger
Test: manually
Bug:
32025203
Change-Id: I787984fc8ab7151ecce9e62a25fa03b0ecf263cd
Colin Cross [Fri, 18 Nov 2016 01:58:23 +0000 (01:58 +0000)]
Merge "Fix warnings in framworks/native/opengl/include" am:
d12c9369d5
am:
7354c237ea
Change-Id: I43d772721d8ad9538b0ced7bb9592ad0f1dd0dd8
Colin Cross [Fri, 18 Nov 2016 01:55:54 +0000 (01:55 +0000)]
Merge "Fix warnings in framworks/native/opengl/include"
am:
d12c9369d5
Change-Id: Ifbbccbd890d3ab80910586c52f263e903e36dbbd
Treehugger Robot [Fri, 18 Nov 2016 01:50:49 +0000 (01:50 +0000)]
Merge "Fix warnings in framworks/native/opengl/include"
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: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: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: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: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: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 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: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: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: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: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: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: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: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"
Colin Cross [Fri, 4 Nov 2016 00:36:46 +0000 (17:36 -0700)]
Fix warnings in framworks/native/opengl/include
Fix old-style cast warnings by using a macro to do C or C++ style
casts. Remove a visibility attribute being applied to a typedef.
The warnings were being hidden by the use of -isystem to include
frameworks/native/opengl/include.
Bug:
31752268
Test: m -j native
Change-Id: I7db3f7181e3542fc7194e1f18010dd2df5d4c57e
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
Manoj Gupta [Wed, 2 Nov 2016 00:30:24 +0000 (17:30 -0700)]
Fix clang static analyzer warnings.
frameworks/native/cmds/flatland/GLHelper.cpp:366:9: warning: Potential
leak of memory pointed to by 'src'
Test: Warning no longer appears
Change-Id: I2721d292cf1f387f34fb2e69f8370f1abff3f01f
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: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
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
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
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
OSDN Git Service
