OSDN Git Service
Felipe Leme [Thu, 5 Jan 2017 23:05:46 +0000 (15:05 -0800)]
Added -t option to dumpstate.
This option takes a lightweight version of bugreport that only includes a few,
urgent sections used to report telephony bugs.
BUG:
32589463
BUG:
26849505
Test: manual
Merged-In: I9b7369323a62e30e5d740eeb22db0045262387ba
Change-Id: I9b7369323a62e30e5d740eeb22db0045262387ba
Ajit Kumar [Thu, 29 Dec 2016 21:56:44 +0000 (21:56 +0000)]
gralloc1: Acquire mutex early in release
am:
56ec3afb84
Change-Id: I7aaea43b24c8aa482d557057f3d715b56bdf4cec
Ajit Kumar [Fri, 25 Nov 2016 06:38:53 +0000 (12:08 +0530)]
gralloc1: Acquire mutex early in release
Due race condition between release and retain calls, retain return stale handle.
Which results in crash in SurfaceFlinger.
Fix crash by acquiring mutex early in release function.
Bug:
32384569
Change-Id: I9130f5864a53ef208dc1ad8ecf698f1847548285
Peng Xu [Wed, 30 Nov 2016 01:54:50 +0000 (17:54 -0800)]
[sensorservice] Init batterystats service when needed
This avoid race condition at parallel services start up that
may results in sensor power usage not being properly recorded.
Test: check all sensors, they still work
Bug:
33199244
Bug:
33623300
Change-Id: I48946667db54fc72d9be6c13b981b44d1bab88c2
(cherry picked from commit
0a031596e12ce0f081b9ee116f48f4f4635d516e)
Daniel Koch [Tue, 13 Dec 2016 23:45:13 +0000 (18:45 -0500)]
libvulkan: add NULL check to DestroySwapchainKHR
vkDestroySwapchainKHR is required to silently ignore NULL handles
that are provided to it to destroy.
This adds an early return if swapchain_handle is NULL.
Test: dEQP-VK.wsi.android.swapchain.destroy.null_handle (VK 1.0.2 CTS)
Change-Id: Ic230f114a680210cb0e0de931b17e4d70fb27f44
(cherry picked from commit
d78c2e8a0807ff45db4cb643cc2ef38eafd22551)
Ajay Panicker [Wed, 14 Sep 2016 19:26:46 +0000 (12:26 -0700)]
Add btsnoop_hci.log to bugreport zip (1/2)
Bug:
28672558
Test: Manual
Merged-In: I2995a9fd0e8be031c022ef8f275aae35265ba452
Change-Id: I2995a9fd0e8be031c022ef8f275aae35265ba452
(cherry picked from commit
2f531771707bcdfc12543a99c168f8462b423b13)
Craig Donner [Fri, 9 Dec 2016 23:34:56 +0000 (15:34 -0800)]
Allow both RENDER and TEXTURE flags when creating native client buffers.
Bug:
33057441
Change-Id: I64ebf6bb5cb534d7f67a9338ebac4bf23a47d607
Andy Hung [Fri, 9 Dec 2016 23:00:21 +0000 (23:00 +0000)]
IServiceManager: Improve getService responsiveness in absence of service
am:
3b36bcf703
Change-Id: Idf103a3faaa30ce085b4af565dcf72096a7e3242
Andy Hung [Tue, 6 Dec 2016 17:40:01 +0000 (09:40 -0800)]
IServiceManager: Improve getService responsiveness in absence of service
Now blocks for 4 seconds worst case instead of 5 seconds.
Some android devices may not have all the normal android phone services.
Test: Wear device on feldspar-dev
Bug:
33086228
Change-Id: Id83fc8cd6b657b53ef78823a460d5fba4a522ab4
(cherry picked from commit
6456e4488d59c0568a1f29dc93b7beb472236086)
Fabien Sanglard [Tue, 6 Dec 2016 19:38:08 +0000 (19:38 +0000)]
Merge "Fix security vulneratibly
31960359" into nyc-dev am:
fefc4f4e94 am:
afee0c9de4 am:
68fcdf6a93
am:
f09debed94
Change-Id: Ic72c9fc0ddfc98cfced88a0e2958b6392bbb48a9
Fabien Sanglard [Tue, 6 Dec 2016 19:37:58 +0000 (19:37 +0000)]
Fix security vulneratibly
31960359 am:
dffa078205 am:
b8b076e553 am:
46dd3c89e5
am:
04f62d5b99
Change-Id: I64a922e22d208013967018bdf62213525db75f73
Fabien Sanglard [Tue, 6 Dec 2016 19:34:10 +0000 (19:34 +0000)]
Merge "Fix security vulneratibly
31960359" into nyc-dev am:
fefc4f4e94 am:
afee0c9de4
am:
68fcdf6a93
Change-Id: I438cd8b4b922d9a76fda92d1e24a4a02c2e0f0c5
Fabien Sanglard [Tue, 6 Dec 2016 19:33:58 +0000 (19:33 +0000)]
Fix security vulneratibly
31960359 am:
dffa078205 am:
b8b076e553
am:
46dd3c89e5
Change-Id: I7664021716dc9f1a1e09afdbeb04a02f84195354
Fabien Sanglard [Tue, 6 Dec 2016 19:30:39 +0000 (19:30 +0000)]
Merge "Fix security vulneratibly
31960359" into nyc-dev am:
fefc4f4e94
am:
afee0c9de4
Change-Id: I8378cc46c5d1caaa3b018c45929b6767cefa3bb9
Fabien Sanglard [Tue, 6 Dec 2016 19:30:28 +0000 (19:30 +0000)]
Fix security vulneratibly
31960359 am:
dffa078205
am:
b8b076e553
Change-Id: Ia073be4ad2910078ac1e736ef6d2afadd849a525
Fabien Sanglard [Tue, 6 Dec 2016 19:26:58 +0000 (19:26 +0000)]
Merge "Fix security vulneratibly
31960359" into nyc-dev
am:
fefc4f4e94
Change-Id: I06631f20e9a9070ff3a71c03f9d4bab324a8b27b
Fabien Sanglard [Tue, 6 Dec 2016 19:26:57 +0000 (19:26 +0000)]
Fix security vulneratibly
31960359
am:
dffa078205
Change-Id: Icea9297e2e5f7467ece053ae869208758f40b954
Fabien Sanglard [Tue, 6 Dec 2016 19:22:20 +0000 (19:22 +0000)]
Merge "Fix security vulneratibly
31960359" into nyc-dev
Christopher Tate [Tue, 6 Dec 2016 00:31:19 +0000 (00:31 +0000)]
resolve merge conflicts of
13c5c34 to mnc-dev am:
79b74d787d am:
abe293b950 am:
02e4440eab am:
953c05276e am:
e37a4dc7c4 am:
8ed5e3d7ca am:
9d5dd3f584
am:
9ef37cdcdc
Change-Id: Ie9b96397a99a57ec18a6b86e6733631abd0feb68
Christopher Tate [Tue, 6 Dec 2016 00:28:19 +0000 (00:28 +0000)]
resolve merge conflicts of
13c5c34 to mnc-dev am:
79b74d787d am:
abe293b950 am:
02e4440eab am:
953c05276e am:
e37a4dc7c4 am:
8ed5e3d7ca
am:
9d5dd3f584
Change-Id: Ic7effb22aa05c626d007aef30ab572363197cad3
Christopher Tate [Tue, 6 Dec 2016 00:24:19 +0000 (00:24 +0000)]
resolve merge conflicts of
13c5c34 to mnc-dev am:
79b74d787d am:
abe293b950 am:
02e4440eab am:
953c05276e am:
e37a4dc7c4
am:
8ed5e3d7ca
Change-Id: I634d3910a329dd10a90086c5c116ae716b2187af
Christopher Tate [Tue, 6 Dec 2016 00:22:18 +0000 (00:22 +0000)]
resolve merge conflicts of
13c5c34 to mnc-dev am:
79b74d787d am:
abe293b950 am:
02e4440eab am:
953c05276e
am:
e37a4dc7c4
Change-Id: Ie0e23d8fc47bf2cb87181ddf1a03dd439fc0f3f4
Christopher Tate [Tue, 6 Dec 2016 00:17:19 +0000 (00:17 +0000)]
resolve merge conflicts of
13c5c34 to mnc-dev am:
79b74d787d am:
abe293b950 am:
02e4440eab
am:
953c05276e
Change-Id: If6e16f080e701171d7c9b69adbeaab3a6910b63a
Christopher Tate [Tue, 6 Dec 2016 00:13:48 +0000 (00:13 +0000)]
resolve merge conflicts of
13c5c34 to mnc-dev am:
79b74d787d am:
abe293b950
am:
02e4440eab
Change-Id: I66e7e982176555f09bf298325754d708ef0ecac0
Christopher Tate [Tue, 6 Dec 2016 00:09:47 +0000 (00:09 +0000)]
resolve merge conflicts of
13c5c34 to mnc-dev am:
79b74d787d
am:
abe293b950
Change-Id: I7f8ce6dbb313d592b97b41a982e629680eba36c4
Christopher Tate [Tue, 6 Dec 2016 00:06:18 +0000 (00:06 +0000)]
resolve merge conflicts of
13c5c34 to mnc-dev
am:
79b74d787d
Change-Id: I383dde0596fe37282db3bb62f7ad65e763fdd1dc
Fabien Sanglard [Mon, 5 Dec 2016 23:06:29 +0000 (15:06 -0800)]
Fix security vulneratibly
31960359
BufferQueueCore features a variable mLastQueuedSlot which is not
initialized in its constructor resulting in security vulnerability
Bug:
31960359
Change-Id: If892f59f6288d8b81b1e312995832a20c8341494
Tests: Manually on Angler
Christopher Tate [Mon, 5 Dec 2016 22:10:47 +0000 (14:10 -0800)]
resolve merge conflicts of
13c5c34 to mnc-dev
Change-Id: I7f57cde153648f48ff038400aa437b76971d4771
Christopher Tate [Mon, 5 Dec 2016 21:23:36 +0000 (21:23 +0000)]
Correct overflow check in Parcel resize code am:
8b64307e95
am:
ed6937ae2c
Change-Id: I9ea154fd1f2ca3a69f756066fb49efc99e889224
Christopher Tate [Mon, 5 Dec 2016 21:20:07 +0000 (21:20 +0000)]
Correct overflow check in Parcel resize code
am:
8b64307e95
Change-Id: I371fb7c6aaf34d44d69c740eea95fe3ba125164a
Christopher Tate [Thu, 3 Nov 2016 20:32:41 +0000 (13:32 -0700)]
Correct overflow check in Parcel resize code
Bug
31929765
Change-Id: Ie27b9945f1de056624668869bdf9a5578abff467
Nick Vaccaro [Mon, 28 Nov 2016 22:27:57 +0000 (22:27 +0000)]
[DO NOT MERGE ANYWHERE] Fix bodysensor permission
am:
1f24f0f597 -s ours
Change-Id: Ibd13d13a5ba368b8c700f02d049ffbf92a2abac2
Nick Vaccaro [Wed, 23 Nov 2016 16:44:15 +0000 (08:44 -0800)]
[DO NOT MERGE ANYWHERE] Fix bodysensor permission
Bug:
33094188
Change-Id: I1d91e855163954666a18b2f8daadb2639b946b24
TreeHugger Robot [Mon, 21 Nov 2016 22:38:23 +0000 (22:38 +0000)]
Merge "Remove modem log after they are added to bugreport" into nyc-mr2-dev
Wei Wang [Sun, 20 Nov 2016 04:49:09 +0000 (20:49 -0800)]
atrace.rc: move to post-fs trigger
Test: manually
Bug:
32025203
(cherrypicked from commit
835180a675147ef7dd2a325016efd3b45523acc7)
Change-Id: I787984fc8ab7151ecce9e62a25fa03b0ecf263cd
Naveen Kalla [Sat, 19 Nov 2016 01:32:23 +0000 (17:32 -0800)]
Remove modem log after they are added to bugreport
Delete the modem logfiles after it is added to the
bugreport zip file.
Bug:
32871032
Test: Take bugreports on the device and ensure that
the modem log file is deleted. Also ensure that
the generated bugreport zip file contains modem
logs on userdebug builds
Change-Id: Ia512c11cae95e370b77024492898b3ad697fa8b0
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: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: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:
32660278 am:
2d8a2432e0 am:
e5c91fe2e2 am:
9d14ab5409 am:
275b2347ef am:
aff7827b4f
am:
c8684d517a
Change-Id: I7d37baee66a7a16cb77e227b66ba93bc87119810
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: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: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: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:
32660278 am:
2d8a2432e0 am:
e5c91fe2e2
am:
9d14ab5409
Change-Id: I0ed8d425157308f35b43818a9592267c06cdc807
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: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
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
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
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
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
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
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
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
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: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
Ruben Brunk [Wed, 26 Oct 2016 00:23:04 +0000 (00:23 +0000)]
Merge "Do not set VR mode feature as handset default." into nyc-mr1-dev
am:
4e1d67bd32
Change-Id: I951313d72530540077a777406754ab97a4566d72
Ruben Brunk [Wed, 26 Oct 2016 00:22:50 +0000 (00:22 +0000)]
Do not set VR mode feature as handset default.
am:
5ce292f55b
Change-Id: I913dc6997a275c90b0617c0a785e3991a947bc22
Ruben Brunk [Wed, 26 Oct 2016 00:15:11 +0000 (00:15 +0000)]
Merge "Do not set VR mode feature as handset default." into nyc-mr1-dev
Steve Pfetsch [Tue, 25 Oct 2016 22:13:39 +0000 (22:13 +0000)]
Merge "Revert "services: surfaceflinger: ASAN fix"" into nyc-mr1-dev am:
103ba31665
am:
b3f571bc1e
Change-Id: Iddae1b7f6acf45da61a74622947153cf282e6a91
Steve Pfetsch [Tue, 25 Oct 2016 22:13:26 +0000 (22:13 +0000)]
Revert "services: surfaceflinger: ASAN fix" am:
598f6d5429
am:
d5156b70ff
Change-Id: I35366694c5518390d49d803806955fc85bfc34f2
Steve Pfetsch [Tue, 25 Oct 2016 22:05:01 +0000 (22:05 +0000)]
Merge "Revert "services: surfaceflinger: ASAN fix"" into nyc-mr1-dev
am:
103ba31665
Change-Id: Ic40bef2b672597ad00b4b106410c4347b556998b
Steve Pfetsch [Tue, 25 Oct 2016 22:05:00 +0000 (22:05 +0000)]
Revert "services: surfaceflinger: ASAN fix"
am:
598f6d5429
Change-Id: Ic7f8483308c1f553e1614c8d1624583c9c472423
Steve Pfetsch [Tue, 25 Oct 2016 21:54:41 +0000 (21:54 +0000)]
Merge "Revert "services: surfaceflinger: ASAN fix"" into nyc-mr1-dev
Steve Pfetsch [Tue, 25 Oct 2016 21:47:58 +0000 (21:47 +0000)]
Revert "services: surfaceflinger: ASAN fix"
This reverts commit
1d3df546d5ee4dcc9e7cae6f8b8b790f741539af.
Original patch may have caused a stability issue caught in monkey testing.
Bug:
32312240
Change-Id: Ie8d291679590e624b8b90c4786b1c25c76cb2c9f
Felipe Leme [Tue, 25 Oct 2016 20:54:39 +0000 (20:54 +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: I3f03bee749bde460029a6f27ad57897fe4b38115
Felipe Leme [Tue, 25 Oct 2016 20:54:26 +0000 (20:54 +0000)]
DO NOT MERGE. Revert "Dumpstate should hold a wakelock to save bug report time." am:
bb6b604623
am:
dfc9df466f
Change-Id: I811887b84ada7e44745548064926f0bfd9f3ad57
Felipe Leme [Tue, 25 Oct 2016 20:49:46 +0000 (20:49 +0000)]
Merge "DO NOT MERGE. Revert "Dumpstate should hold a wakelock to save bug report time."" into nyc-mr1-dev
am:
7781eccbc3
Change-Id: If9f104497a20203c6fd854091082672826857b52
Felipe Leme [Tue, 25 Oct 2016 20:49:45 +0000 (20:49 +0000)]
DO NOT MERGE. Revert "Dumpstate should hold a wakelock to save bug report time."
am:
bb6b604623
Change-Id: I08b640b8c1ffae80205be5dcf179403c335e43ba
TreeHugger Robot [Tue, 25 Oct 2016 20:44:14 +0000 (20:44 +0000)]
Merge "DO NOT MERGE. Revert "Dumpstate should hold a wakelock to save bug report time."" into nyc-mr1-dev
Felipe Leme [Tue, 25 Oct 2016 18:18:24 +0000 (18:18 +0000)]
DO NOT MERGE. Revert "Dumpstate should hold a wakelock to save bug report time."
This reverts commit
f87959e00732d7d737527f1248a71adea99ae29d.
BUG:
32402587
Fixes:
32365477
Change-Id: Ic4daec37efbaef1906450bf6609d5588d5c9a835
Ruben Brunk [Tue, 25 Oct 2016 01:28:46 +0000 (18:28 -0700)]
Do not set VR mode feature as handset default.
Bug:
31959453
Change-Id: I6fef6781e14f3c1239197798b79cc9239d34d53d
Felipe Leme [Fri, 21 Oct 2016 23:53:47 +0000 (23:53 +0000)]
DO NOT MERGE. Added a is_zipping() function.
am:
03974984bf
Change-Id: Ib14224bf42315b3b1633662fac1f88610a824296
Felipe Leme [Fri, 21 Oct 2016 18:38:26 +0000 (11:38 -0700)]
DO NOT MERGE. Added a is_zipping() function.
BUG:
32219165
Fixes:
32335112
Change-Id: I2bc630f9c840ccd3a2e0474ed16a766e8a405ad8
Steve Pfetsch [Wed, 19 Oct 2016 04:53:17 +0000 (04:53 +0000)]
services: surfaceflinger: ASAN fix
am:
1d3df546d5
Change-Id: If0447f27ab0a1c3033b0a87fc8426f53c2a82ac5
Steve Pfetsch [Fri, 30 Sep 2016 00:16:29 +0000 (17:16 -0700)]
services: surfaceflinger: ASAN fix
Move layer removal to the main thread, while the display is on.
Bug:
30281222
Change-Id: Id9f956c1e626819734868340e7fa12abf257b702
Matthew Bouyack [Tue, 18 Oct 2016 17:10:30 +0000 (17:10 +0000)]
Merge changes I5d907c33,Ibce48cd2 into cw-f-dev
* changes:
In SurfaceFlinger, test fence before merging
libui: Change hasSignaled to return optional<bool>
Nick Vaccaro [Mon, 17 Oct 2016 22:40:51 +0000 (15:40 -0700)]
Sensors: Add WRIST_TILT_GESTURE as wake sensor
Include WRIST_TILT_GESTURE sensor type when determining if
a sensor is a wake sensor or not in getDefaultSensor().
Change-Id: Ib9ae3990e063848163edd34be2ec021ed518e346
Matthew Bouyack [Fri, 7 Oct 2016 22:06:15 +0000 (15:06 -0700)]
In SurfaceFlinger, test fence before merging
If the old fence for a given layer has already expired, we can replace
it with the new fence rather than merging the two.
This saves 300-400us per frame on Android Wear
Change-Id: I5d907c336c7383ae4e2e0f71e42f23749494a359
Dan Stoza [Thu, 13 Oct 2016 16:45:00 +0000 (09:45 -0700)]
libui: Change hasSignaled to return optional<bool>
Since the android::Fence::wait() call can possibly return an error,
we need some way of indicating to the caller of hasSignaled that a
fence that has not yet signaled (because it is in an error state) will
never signal. To do this, we return an optional<bool>, where true and
false indicate both that the fence is valid and that it has or hasn't
signaled. If an error is returned from wait(), we return a default
optional value (that is neither true nor false).
Test: m
Change-Id: Ibce48cd2e71ddb8ccf6cabe3284afe0efca8c132
OSDN Git Service
