OSDN Git Service
Mathias Agopian [Fri, 9 Jun 2017 19:49:24 +0000 (19:49 +0000)]
Merge "Add missing VNDK pixel formats to AHardwareBuffer" into oc-dev am:
2563c0f3b0
am:
f86cfd6dd9
Change-Id: I7a4e930b62e9cdffa22a66b09509b0927a05beeb
Mathias Agopian [Fri, 9 Jun 2017 19:40:38 +0000 (19:40 +0000)]
Merge "Add missing VNDK pixel formats to AHardwareBuffer" into oc-dev am:
2563c0f3b0
am:
b52ddcb252
Change-Id: I29100f8c59a63036606523991fb0bd03a1d32329
Mathias Agopian [Fri, 9 Jun 2017 19:39:25 +0000 (19:39 +0000)]
Merge "Add missing VNDK pixel formats to AHardwareBuffer" into oc-dev
am:
2563c0f3b0
Change-Id: Iba3dfbfcbaa778da25de68a16beee024ac1b6efe
Mathias Agopian [Fri, 9 Jun 2017 19:36:27 +0000 (19:36 +0000)]
Merge "Add missing VNDK pixel formats to AHardwareBuffer" into oc-dev
am:
2563c0f3b0
Change-Id: I10e623eebb70da1f4127c0eec2aa85867da0623c
Mathias Agopian [Fri, 9 Jun 2017 19:02:45 +0000 (19:02 +0000)]
Merge "Add missing VNDK pixel formats to AHardwareBuffer" into oc-dev
Okan Arikan [Fri, 9 Jun 2017 16:54:44 +0000 (16:54 +0000)]
Merge "Floor height API changes." into oc-dr1-dev
am:
2717eaba05
Change-Id: Id5783b9713cda9a5b1c62499a29322af3e86630c
Okan Arikan [Fri, 9 Jun 2017 16:48:47 +0000 (16:48 +0000)]
Merge "Floor height API changes." into oc-dr1-dev
Android Build Merger (Role) [Fri, 9 Jun 2017 08:02:23 +0000 (08:02 +0000)]
Merge "Fix build am:
aaef0983ba am:
2c410e0d5f" into oc-dr1-dev-plus-aosp
Jorim Jaggi [Fri, 9 Jun 2017 08:02:05 +0000 (08:02 +0000)]
Fix build am:
aaef0983ba
am:
2c410e0d5f
Change-Id: I10728186af370d9e47196eeda43dfeccc582bc74
Jorim Jaggi [Fri, 9 Jun 2017 08:02:04 +0000 (08:02 +0000)]
Fix build am:
aaef0983ba
am:
5a556bc71e
Change-Id: I59426f537ebe484b865a3b424e7e56608fa14112
Jorim Jaggi [Fri, 9 Jun 2017 07:59:34 +0000 (07:59 +0000)]
Fix build
am:
aaef0983ba
Change-Id: I087952f069da1ba624bef32d1ac913a242533321
Jorim Jaggi [Fri, 9 Jun 2017 07:59:34 +0000 (07:59 +0000)]
Fix build
am:
aaef0983ba
Change-Id: Ia4d360cb942c43180d6077cd01bd9e9eb5b598d5
Jorim Jaggi [Fri, 9 Jun 2017 06:55:29 +0000 (23:55 -0700)]
Fix build
Test: builds
Bug:
36631902
Change-Id: Iec23f8ab2b16c923f07d1857aa3471cfefc057dd
Jorim Jaggi [Fri, 9 Jun 2017 04:27:03 +0000 (04:27 +0000)]
Properly run window animations at vsync-sf (2/2) am:
b1e2f8deb3
am:
5d37ae59e0
Change-Id: I286fbd09c2fe425a90fd2b93c4a83b03d55e8113
Jorim Jaggi [Fri, 9 Jun 2017 04:24:54 +0000 (04:24 +0000)]
Properly run window animations at vsync-sf (2/2) am:
b1e2f8deb3
am:
d5ebce91c8
Change-Id: I30768aba500834a157290871b0970f20a8eebd06
Jorim Jaggi [Fri, 9 Jun 2017 04:16:44 +0000 (04:16 +0000)]
Properly run window animations at vsync-sf (2/2)
am:
b1e2f8deb3
Change-Id: I2cf08e016fcd177117d7135d211e2676a1945eba
Jorim Jaggi [Fri, 9 Jun 2017 04:15:20 +0000 (04:15 +0000)]
Properly run window animations at vsync-sf (2/2)
am:
b1e2f8deb3
Change-Id: I7fbd22c681688edce1eda7f2786c68e6cbe32a22
Mathias Agopian [Fri, 9 Jun 2017 02:44:17 +0000 (19:44 -0700)]
Add missing VNDK pixel formats to AHardwareBuffer
AHardwareBuffer is now the only API available to
vendors to create graphic buffers in their HAL
implementations, unfortunately AHardwareBuffer
was designed for NDK use and was missing all
HAL specific pixel formats.
This CL adds these missing format to the VNDK-only
header.
The implementation is changed to accept all formats
which means, VNDK formats are indirectly exposed
to the NDK.
Bug:
38466076
Test: manual
Change-Id: I1e752cd33641aa861d9d15432cde6bec5a682e9a
Jorim Jaggi [Thu, 8 Jun 2017 22:43:59 +0000 (15:43 -0700)]
Properly run window animations at vsync-sf (2/2)
- Add new Choreographer instance that runs on vsync-sf
- Use this new Choreographer for WindowAnimator, and remove all
the hacks around it
Test: Open apps and close apps, notice no stutter
Test: Screen zoom animations
Test: go/wm-smoke
Bug:
36631902
Change-Id: I72a8b39709303a38fc077100229b8a81a153ba3e
Okan Arikan [Tue, 6 Jun 2017 16:52:33 +0000 (09:52 -0700)]
Floor height API changes.
The platform does not populate this field yet. This CL is for making the
necessary API change in frameworks/native before we cut the DR branch.
Bug:
38212129
Test: No functional change. Must compile.
Change-Id: Iaa21bbc0cec866bf5325d760e13989e49bce502a
Android Build Merger (Role) [Thu, 8 Jun 2017 15:37:41 +0000 (15:37 +0000)]
Merge "Merge "Don't double-count external cached app data." into oc-dev am:
b5a1f50f5e am:
c11cc1d365" into oc-dr1-dev-plus-aosp
Jeff Sharkey [Thu, 8 Jun 2017 15:37:20 +0000 (15:37 +0000)]
Merge "Don't double-count external cached app data." into oc-dev am:
b5a1f50f5e
am:
267b4fd7e7
Change-Id: Id940efe570f37a873df7a1b4a4b1dd1ee4ef32b0
Jeff Sharkey [Thu, 8 Jun 2017 15:37:19 +0000 (15:37 +0000)]
Merge "Don't double-count external cached app data." into oc-dev am:
b5a1f50f5e
am:
c11cc1d365
Change-Id: I543c21f831b22ab5a74da370a8b18acfb5891d7e
Jeff Sharkey [Thu, 8 Jun 2017 15:34:49 +0000 (15:34 +0000)]
Merge "Don't double-count external cached app data." into oc-dev
am:
b5a1f50f5e
Change-Id: Ia991cb98e842a9a9f64e669435c860611e79ff72
Jeff Sharkey [Thu, 8 Jun 2017 15:34:49 +0000 (15:34 +0000)]
Merge "Don't double-count external cached app data." into oc-dev
am:
b5a1f50f5e
Change-Id: Ia2057fe4522596b4593465db1f5d6cdcbf39c063
Jeff Sharkey [Thu, 8 Jun 2017 15:27:07 +0000 (15:27 +0000)]
Merge "Don't double-count external cached app data." into oc-dev
Peng Xu [Thu, 8 Jun 2017 10:26:51 +0000 (10:26 +0000)]
Merge "No more ashmem equivalent checker false alarm" into oc-dev am:
d6d91e5833
am:
9d4f73e753
Change-Id: Ife1b6aa7c68d97fe1ba0a0b121852d2d2cbb1a80
Peng Xu [Thu, 8 Jun 2017 10:26:08 +0000 (10:26 +0000)]
Merge "No more ashmem equivalent checker false alarm" into oc-dev am:
d6d91e5833
am:
a8e13ef021
Change-Id: Ia83ac2bda90969378009ce9beda7acc3d576b511
Peng Xu [Thu, 8 Jun 2017 10:23:02 +0000 (10:23 +0000)]
Merge "No more ashmem equivalent checker false alarm" into oc-dev
am:
d6d91e5833
Change-Id: I754b5d0d1e9426efa07821eba8a6ca6c826914cf
Peng Xu [Thu, 8 Jun 2017 10:23:01 +0000 (10:23 +0000)]
Merge "No more ashmem equivalent checker false alarm" into oc-dev
am:
d6d91e5833
Change-Id: Ia4dad911062490db360fec8a1dc470b5a7bce9d6
TreeHugger Robot [Thu, 8 Jun 2017 10:16:09 +0000 (10:16 +0000)]
Merge "No more ashmem equivalent checker false alarm" into oc-dev
Matthew Bouyack [Wed, 7 Jun 2017 23:22:24 +0000 (23:22 +0000)]
Merge "DO NOT MERGE: Eliminate redundant changes to hardware vsync state." into cw-f-dev am:
9e5585930a am:
f613f073b2 -s ours am:
4c0bb0a09a
am:
9a41a3483a
Change-Id: I65d061197561958cce50bc4a34b0123a25d17687
Matthew Bouyack [Wed, 7 Jun 2017 23:09:54 +0000 (23:09 +0000)]
Merge "DO NOT MERGE: Eliminate redundant changes to hardware vsync state." into cw-f-dev am:
9e5585930a am:
f613f073b2 -s ours am:
4c0bb0a09a
am:
5b4bcd21ac
Change-Id: If79fbe8a291e8e14eff877c01def5bd78a0aaedd
Matthew Bouyack [Wed, 7 Jun 2017 23:07:56 +0000 (23:07 +0000)]
Merge "DO NOT MERGE: Eliminate redundant changes to hardware vsync state." into cw-f-dev am:
9e5585930a am:
f613f073b2 -s ours
am:
4c0bb0a09a
Change-Id: I579772728ba0f1c12ac6a611c53b0bba6e23c09b
Matthew Bouyack [Wed, 7 Jun 2017 23:05:31 +0000 (23:05 +0000)]
Merge "DO NOT MERGE: Eliminate redundant changes to hardware vsync state." into cw-f-dev am:
9e5585930a am:
f613f073b2 -s ours
am:
4c0bb0a09a
Change-Id: I7872b8894502b9286206f7d73563634a3ac34c3b
Matthew Bouyack [Wed, 7 Jun 2017 22:59:18 +0000 (22:59 +0000)]
Merge "DO NOT MERGE: Eliminate redundant changes to hardware vsync state." into cw-f-dev am:
9e5585930a
am:
f613f073b2 -s ours
Change-Id: I8a6e0a9b7e7810cfc33db9de074c2cdac139d233
Matthew Bouyack [Wed, 7 Jun 2017 22:53:37 +0000 (22:53 +0000)]
Merge "DO NOT MERGE: Eliminate redundant changes to hardware vsync state." into cw-f-dev
am:
9e5585930a
Change-Id: I3b534f26c60bd8d6cf0736da7de807cf339a1cdd
Matthew Bouyack [Wed, 7 Jun 2017 22:46:08 +0000 (22:46 +0000)]
Merge "DO NOT MERGE: Eliminate redundant changes to hardware vsync state." into cw-f-dev
Matthew Bouyack [Thu, 1 Jun 2017 21:37:29 +0000 (14:37 -0700)]
DO NOT MERGE: Eliminate redundant changes to hardware vsync state.
When transitioning between NORMAL and DOZE power modes
we were redundantly calling resyncHardwareVsync.
Similarly, when transitioning from DOZE_SUSPEND to OFF
we were redundantly calling disableHardwareVsync.
This change eliminates those redundant calls.
Fixes bug
62235417
Change-Id: I513bbf94a7ab973ab258efe16436441ac2379b70
Jeff Sharkey [Wed, 7 Jun 2017 21:59:03 +0000 (15:59 -0600)]
Don't double-count external cached app data.
Cached app data is already counted in extStats.dataSize, so we don't
need to count it twice.
Test: builds, boots, verified Settings UI before/after
Bug:
62343684
Change-Id: Ic02cbe3f5938949730f9bc8d911ed398436f84d7
Jiwen 'Steve' Cai [Wed, 7 Jun 2017 19:35:17 +0000 (19:35 +0000)]
No crash from AHardwareBuffer_unlock on NULL fence am:
ae6955fda8
am:
71b22bee5b
Change-Id: I749958788a77eba8879acdd61dcd302f60122572
Jiwen 'Steve' Cai [Wed, 7 Jun 2017 19:32:46 +0000 (19:32 +0000)]
No crash from AHardwareBuffer_unlock on NULL fence am:
ae6955fda8
am:
c197b62e97
Change-Id: Ida8d12b6ff13655683dd604d112d47048f378be3
Jiwen 'Steve' Cai [Wed, 7 Jun 2017 19:30:47 +0000 (19:30 +0000)]
No crash from AHardwareBuffer_unlock on NULL fence
am:
ae6955fda8
Change-Id: I884ab8f0f15ad2e9e838572be638bfeee076686f
Jiwen 'Steve' Cai [Wed, 7 Jun 2017 19:30:46 +0000 (19:30 +0000)]
No crash from AHardwareBuffer_unlock on NULL fence
am:
ae6955fda8
Change-Id: Iaedc2bbf55cf369b9c273678a0787572826b8f72
Jiwen 'Steve' Cai [Fri, 2 Jun 2017 22:23:26 +0000 (15:23 -0700)]
No crash from AHardwareBuffer_unlock on NULL fence
The API document states: "If fence is not NULL then it will be set to a
file descriptor that is signaled when all pending work on the buffer is
completed." As it's too late to change the document, we should probably
update the implement and use GraphicsBuffer::unlock under the hood.
Bug:
62302267
Test: Build, AHardware CTS
Change-Id: Ic0fac5d7addfba67baaa1b5d7c221fc25d02df56
(cherry picked from commit
6cdbb537105b663572e71afe06bde1164fc215f3)
TreeHugger Robot [Wed, 7 Jun 2017 04:05:22 +0000 (04:05 +0000)]
Merge changes from topic 'vrflinger-cleanup'
* changes:
libbufferhub: Fix native buffer.
libvrflinger: Move display request to avoid duplicate calls.
libvrflinger: Remove superfluous update to display manager.
libvrflinger: Move some tracing to a more verbose level.
libvrflinger: Add additional info to PDX dump.
Peng Xu [Wed, 7 Jun 2017 03:16:09 +0000 (03:16 +0000)]
Merge "Support custom permission, slight adjust of dumpsys print"
TreeHugger Robot [Wed, 7 Jun 2017 02:36:12 +0000 (02:36 +0000)]
Merge "Read saturation boost from a persistent property"
Corey Tabaka [Wed, 10 May 2017 23:27:21 +0000 (16:27 -0700)]
libbufferhub: Fix native buffer.
This class was broken during a clean up. Fix the code in preparation
for adding tools that will use it again.
Bug: None
Test: build; flash
Change-Id: I8e60c7ba316080a24ff8914807972886e21ebce9
Corey Tabaka [Tue, 6 Jun 2017 23:33:31 +0000 (16:33 -0700)]
libvrflinger: Move display request to avoid duplicate calls.
Move the request display call to avoid duplicate calls when direct
surfaces change but the current VrFlinger mode does not change.
Bug:
62389162
Test: build; flash; VrFlinger mode works.
Change-Id: I1348ada93e2992306cba7e319f9b20726fb97cb7
Corey Tabaka [Tue, 6 Jun 2017 23:16:28 +0000 (16:16 -0700)]
libvrflinger: Remove superfluous update to display manager.
Setting visibility attributes already triggers an update to the
display manager. Avoid the double trigger.
Bug: None
Test: build; run
Change-Id: I4c8a7c814143ccd1a4fc22fe068ba9b05d95cdd6
Corey Tabaka [Tue, 6 Jun 2017 23:14:21 +0000 (16:14 -0700)]
libvrflinger: Move some tracing to a more verbose level.
Quiet the logs when using TRACE=1.
Bug: None
Test: Set TRACE=1; build; observe traces do not appear.
Change-Id: I521fa5cf4b0ab18e73f89a1898bf2d58fc2d1f88
Corey Tabaka [Fri, 19 May 2017 19:02:58 +0000 (12:02 -0700)]
libvrflinger: Add additional info to PDX dump.
- Add logging for surface and layers.
- Minor cleanup of AcquiredBuffer code.
- Add additional debug tracing.
Bug: None
Test: servicetool --dump /dev/socket/pdx/system/vr/display/client
Change-Id: Ie7cfe46978139e0eef2184b03acb4b9bab428a33
TreeHugger Robot [Tue, 6 Jun 2017 23:20:56 +0000 (23:20 +0000)]
Merge "buffer_hub_queue_client: Batch allocate buffers"
Yi Kong [Tue, 6 Jun 2017 23:05:38 +0000 (23:05 +0000)]
Do not use default initializer for union
am:
584dfc7688
Change-Id: I328296e07f5b6e5c3f880a2b243a7fe2e297252e
Yi Kong [Thu, 11 May 2017 18:51:08 +0000 (11:51 -0700)]
Do not use default initializer for union
The next Clang update complains about this code pattern. Rewrite default
constructor to explicitly initialize the union field instead of using
the default initializer.
Test: Build
Bug:
37752547
Change-Id: I22a2aa392d7f4803282baed832b0fa2f852016ac
(cherry picked from commit
4fdbdd1692a549a31382f33f5d529fd141453ea1)
Joel Fernandes [Tue, 6 Jun 2017 20:56:50 +0000 (20:56 +0000)]
atrace: setup saved_cmdlines_size and write only if available am:
9351f72049
am:
485d70cfa4
Change-Id: I5b0d49466edc2d0824cef0f6b3cef3a5bcf66f09
Joel Fernandes [Tue, 6 Jun 2017 20:54:50 +0000 (20:54 +0000)]
atrace: setup saved_cmdlines_size and write only if available
am:
9351f72049
Change-Id: I6ac54d96cda205bc5d4e4d569b03b2064140e310
Nicolas Geoffray [Tue, 6 Jun 2017 20:48:00 +0000 (20:48 +0000)]
Merge "Revert "Disable in-place vdex update"" into oc-dev am:
7258088ea5
am:
0ef3b0eca2
Change-Id: I54f6eea644b392f6aefa9c07e035a1e2478ba311
Joel Fernandes [Tue, 6 Jun 2017 19:20:29 +0000 (12:20 -0700)]
atrace: setup saved_cmdlines_size and write only if available
Older kernels (bullhead etc) don't have saved_cmdlines_size, check and
write only if available. Also make work on non-root by setting
permissions in rc file (thanks John Reck for suggestion).
Bug:
62375794
Change-Id: Iefffc3203afd092ffb6cf420a144b38844aaee39
Signed-off-by: Joel Fernandes <joelaf@google.com>
Nicolas Geoffray [Tue, 6 Jun 2017 20:38:42 +0000 (20:38 +0000)]
Merge "Revert "Disable in-place vdex update"" into oc-dev
am:
7258088ea5
Change-Id: I3e36f53541ccac1cccd2361d4d6b752e8e881668
Nicolas Geoffray [Tue, 6 Jun 2017 20:20:33 +0000 (20:20 +0000)]
Merge "Revert "Disable in-place vdex update"" into oc-dev
Joel Fernandes [Tue, 6 Jun 2017 19:20:29 +0000 (12:20 -0700)]
atrace: setup saved_cmdlines_size and write only if available
Older kernels (bullhead etc) don't have saved_cmdlines_size, check and
write only if available. Also make work on non-root by setting
permissions in rc file (thanks John Reck for suggestion).
Bug:
62375794
Change-Id: Iefffc3203afd092ffb6cf420a144b38844aaee39
Signed-off-by: Joel Fernandes <joelaf@google.com>
Jiwen 'Steve' Cai [Thu, 25 May 2017 06:16:54 +0000 (23:16 -0700)]
buffer_hub_queue_client: Batch allocate buffers
Bug:
36147743
Test: buffer_hub_queue-test, buffer_hub_queue_producer-test, dvr_api-test
Change-Id: I40a9babfa8d28d4496e27a7ccecb7ae1b9bc7bd5
TreeHugger Robot [Tue, 6 Jun 2017 18:20:31 +0000 (18:20 +0000)]
Merge "Add DVR API for scroll event injection."
Mathias Agopian [Tue, 6 Jun 2017 18:19:26 +0000 (18:19 +0000)]
fix race condition that can cause a use after free am:
59485525a6 am:
5da64c91d0 am:
46361c6c2b am:
ee464e00d3 am:
21e9397776 am:
7b8472157a -s ours
am:
66bc85165a
Change-Id: I977e8a53b3ff189b1740dfd612ec19edf0acc79a
Mathias Agopian [Tue, 6 Jun 2017 18:18:59 +0000 (18:18 +0000)]
fix race condition that can cause a use after free am:
59485525a6 am:
5da64c91d0 am:
46361c6c2b am:
ee464e00d3 am:
21e9397776 -s ours am:
1b81145396
am:
390786a204
Change-Id: I606f740ad26e0b415149a657adfe6c2dd879c139
Mathias Agopian [Tue, 6 Jun 2017 18:06:07 +0000 (18:06 +0000)]
fix race condition that can cause a use after free am:
59485525a6 am:
5da64c91d0 am:
46361c6c2b am:
ee464e00d3 am:
21e9397776
am:
7b8472157a -s ours
Change-Id: I5289fea87abce43cb9fa7cf4cb11041b5201800d
Mathias Agopian [Tue, 6 Jun 2017 18:05:04 +0000 (18:05 +0000)]
fix race condition that can cause a use after free am:
59485525a6 am:
5da64c91d0 am:
46361c6c2b am:
ee464e00d3 am:
21e9397776 -s ours
am:
1b81145396
Change-Id: I3038e41c1e4b64e397162fea3ddb80eab6374614
Mathias Agopian [Tue, 6 Jun 2017 17:59:02 +0000 (17:59 +0000)]
fix race condition that can cause a use after free am:
59485525a6 am:
5da64c91d0 am:
46361c6c2b am:
ee464e00d3
am:
21e9397776 -s ours
Change-Id: If0f229ba54f2c9978ba83beca331896d1d303db4
Mathias Agopian [Tue, 6 Jun 2017 17:53:01 +0000 (17:53 +0000)]
fix race condition that can cause a use after free am:
59485525a6 am:
5da64c91d0 am:
46361c6c2b am:
ee464e00d3
am:
21e9397776
Change-Id: Ifffa0ed1d960232754976ebb29b891ec99d62b75
Mathias Agopian [Tue, 6 Jun 2017 17:46:30 +0000 (17:46 +0000)]
fix race condition that can cause a use after free am:
59485525a6 am:
5da64c91d0 am:
46361c6c2b
am:
ee464e00d3
Change-Id: Ifb22956eadae06f2ff6b0445d5e92e450c947942
Mathias Agopian [Tue, 6 Jun 2017 17:40:00 +0000 (17:40 +0000)]
fix race condition that can cause a use after free am:
59485525a6 am:
5da64c91d0
am:
46361c6c2b
Change-Id: I33758163baac3c96525751d313091a5bce0d5377
Mathias Agopian [Tue, 6 Jun 2017 17:33:59 +0000 (17:33 +0000)]
fix race condition that can cause a use after free am:
59485525a6
am:
5da64c91d0
Change-Id: I6358492afbd410f20a96ceccc7957a67112c58bc
Mathias Agopian [Tue, 6 Jun 2017 17:27:59 +0000 (17:27 +0000)]
fix race condition that can cause a use after free
am:
59485525a6
Change-Id: I42d7ee49dc3dcbd9d5d4a86fc9d018ff6c29534d
Kevin Schoedel [Mon, 5 Jun 2017 15:13:20 +0000 (11:13 -0400)]
Add DVR API for scroll event injection.
Bug:
62226675
Test: manual, vrcore build
Change-Id: Ic7d329eba8003b0e294b3a11a83ed5f868b801f8
Chia-I Wu [Tue, 6 Jun 2017 16:23:38 +0000 (16:23 +0000)]
Merge "surfaceflinger: fix layer count" into oc-dev am:
39cf8b4944
am:
317b493667
Change-Id: Ibc092a475c8733a7a70359516e869a83573c6f5c
Chia-I Wu [Tue, 6 Jun 2017 15:42:52 +0000 (15:42 +0000)]
Merge "surfaceflinger: fix layer count" into oc-dev
am:
39cf8b4944
Change-Id: I6a7c3ebc27831792be6329ac6083c86c61f01499
Chia-I Wu [Tue, 6 Jun 2017 15:32:08 +0000 (15:32 +0000)]
Merge "surfaceflinger: fix layer count" into oc-dev
Nicolas Geoffray [Mon, 5 Jun 2017 12:38:10 +0000 (12:38 +0000)]
Revert "Disable in-place vdex update"
Reverting to only apply this when doing dexlayout.
PS1 is a pure revert. PS2 contains the fix.
This reverts commit
e446fede9258359b61d4c8753d7e96477fa29388.
Bug:
38113240
Test: OTA and dexopt
(cherry picked from commit
b03814f39559c824e097bf2d869c7a56d8b41b67)
Change-Id: Ibabb1ec3af1101c6c44fbea498f8625c9515af8f
Nicolas Geoffray [Tue, 6 Jun 2017 08:44:36 +0000 (08:44 +0000)]
Merge "Revert "Disable in-place vdex update"" am:
52ca987db6 am:
deb23917a9 am:
3470e3e3f7
am:
fd256c977a
Change-Id: I59679c67151f61644662229c0106add720299dd1
Nicolas Geoffray [Tue, 6 Jun 2017 08:35:54 +0000 (08:35 +0000)]
Merge "Revert "Disable in-place vdex update"" am:
52ca987db6 am:
deb23917a9
am:
3470e3e3f7
Change-Id: I9b6b0b3fecb25e01b10d126e9d236658acd1e99c
Nicolas Geoffray [Tue, 6 Jun 2017 08:29:54 +0000 (08:29 +0000)]
Merge "Revert "Disable in-place vdex update"" am:
52ca987db6
am:
deb23917a9
Change-Id: I194665350fb6416acc1158fdfc125d6867cbf588
Nicolas Geoffray [Tue, 6 Jun 2017 08:23:23 +0000 (08:23 +0000)]
Merge "Revert "Disable in-place vdex update""
am:
52ca987db6
Change-Id: Id4060442d160fb91b8245388c1a45f442ac20a89
Nicolas Geoffray [Tue, 6 Jun 2017 08:13:27 +0000 (08:13 +0000)]
Merge "Revert "Disable in-place vdex update""
Nicolas Geoffray [Mon, 5 Jun 2017 12:38:10 +0000 (12:38 +0000)]
Revert "Disable in-place vdex update"
Reverting to only apply this when doing dexlayout.
PS1 is a pure revert. PS2 contains the fix.
This reverts commit
e446fede9258359b61d4c8753d7e96477fa29388.
Change-Id: I04a7dbde142d59e8dcdf4e93ab0456c4aa3d02ab
Peng Xu [Mon, 5 Jun 2017 01:15:32 +0000 (18:15 -0700)]
Support custom permission, slight adjust of dumpsys print
Test: tested permission positive and negative case
Test: dumpsys print as expected
Change-Id: I916222fe4cd05ac5268b190fc250e8d51943114d
Romain Guy [Tue, 6 Jun 2017 01:38:53 +0000 (18:38 -0700)]
Read saturation boost from a persistent property
We use a persisten property because Android's various settings
stores are not available early enough to avoid a color change
during the boot animation.
Bug:
62238038
Test: Manual
Change-Id: I905435efe89b5e1c85fc8a396b7888de5c318a18
Mathias Agopian [Tue, 4 Apr 2017 00:14:31 +0000 (17:14 -0700)]
fix race condition that can cause a use after free
Backported from
12a0ccd6f7201bac706d903ac3f436c4358fe203.
Bug:
33004354
Test: manual
Change-Id: I9b38ee644b02268c9b995a330db758aa2e568399
TreeHugger Robot [Mon, 5 Jun 2017 22:34:12 +0000 (22:34 +0000)]
Merge "Let the system process set the saturation boost"
Mark Renouf [Mon, 5 Jun 2017 21:59:01 +0000 (21:59 +0000)]
Merge "Clockwork: add feature android.software.input_methods" into oc-dev am:
eed865e61b
am:
73931bf207
Change-Id: Iabce8207d6ef63f2097c9a18fbafe26b85473f99
Mark Renouf [Mon, 5 Jun 2017 21:50:40 +0000 (21:50 +0000)]
Merge "Clockwork: add feature android.software.input_methods" into oc-dev
am:
eed865e61b
Change-Id: I8698f6f42fcbe2239493c6e03d8f850687c1de8c
Mark Renouf [Mon, 5 Jun 2017 21:42:59 +0000 (21:42 +0000)]
Merge "Clockwork: add feature android.software.input_methods" into oc-dev
Joel Fernandes [Mon, 5 Jun 2017 20:53:04 +0000 (20:53 +0000)]
Merge "atrace: Enable sched_waking if available" into oc-dev am:
4b37107002
am:
5d2e06c8a7
Change-Id: I6f9dd1f9299cbb7c92108e2964f3d19f3dc71f84
Joel Fernandes [Mon, 5 Jun 2017 20:52:31 +0000 (20:52 +0000)]
atrace: Set saved_cmdline_size to 8192 am:
efb73a96b5
am:
be83a34f7d
Change-Id: I062fccf47b3e549a125810e40bf7d28dab19f061
Romain Guy [Mon, 5 Jun 2017 20:51:43 +0000 (13:51 -0700)]
Let the system process set the saturation boost
The display manager service will need to call this code early
in the boot process, but before the hardware test calling permission
check can pass (it depends on the order of initalization of other
services like sensors).
Bug:
62238038
Test: Manual (modified display manager service)
Change-Id: I46a673ba971e566a0b9e023005c41fa54603cd1f
Joel Fernandes [Mon, 5 Jun 2017 20:46:31 +0000 (20:46 +0000)]
Merge "atrace: Enable sched_waking if available" into oc-dev
am:
4b37107002
Change-Id: I961c608a96040cfd87bd55249617c715cb6d6488
Joel Fernandes [Mon, 5 Jun 2017 20:46:07 +0000 (20:46 +0000)]
atrace: Set saved_cmdline_size to 8192
am:
efb73a96b5
Change-Id: I96758a6d56d5478b3287ead6c3d4e43fb7e61524
Joel Fernandes [Mon, 5 Jun 2017 20:41:07 +0000 (20:41 +0000)]
Merge "atrace: Enable sched_waking if available" into oc-dev
Joel Fernandes [Fri, 2 Jun 2017 17:19:28 +0000 (10:19 -0700)]
atrace: Set saved_cmdline_size to 8192
This increases the size of the table tracking comms and pids and
prevents overwriting them easily.
Bug:
38167231
Change-Id: I69b9000e4f9d0c2c7969efd38e02d8c1bffdad5c
Signed-off-by: Joel Fernandes <joelaf@google.com>
(cherry picked from commit
ed80bd04cc3bf80082b1d733ef06d90a29c6270a)
OSDN Git Service
