OSDN Git Service
Peng Xu [Fri, 12 Aug 2016 23:39:44 +0000 (16:39 -0700)]
Fix dangerous unsafe_get() in SensorRecord
Change raw pointers to wp<> and constify relevant lines in
SensorRecord.
Bug:
30261110
Change-Id: I7f28c593366af44192991061fa5f71cf925b22a8
Irvel Nduva Matias Vega [Fri, 12 Aug 2016 19:55:01 +0000 (19:55 +0000)]
Merge changes from topic 'SF: Fix a couple of Layer ref count issues'
* changes:
SF: Change wp usage for deferred transactions in the interceptor to sp
SF: Fix a couple of Layer ref count issues
Irvel Nduva Matias Vega [Fri, 12 Aug 2016 19:54:57 +0000 (19:54 +0000)]
Merge "Fix duplicated VSync tracing in SurfaceInterceptor"
Irvel Nduva Matias Vega [Fri, 12 Aug 2016 19:54:40 +0000 (19:54 +0000)]
Merge changes from topic 'Add display tracing to SurfaceInterceptor'
* changes:
Add display tracing to SurfaceInterceptor
Add display tracing to the surfacecapturereplay proto
Irvel [Tue, 9 Aug 2016 23:50:06 +0000 (16:50 -0700)]
SF: Change wp usage for deferred transactions in the interceptor to sp
Change-Id: Iebee77d30f0b49dc94c3b23e56683efcb2133993
Dan Stoza [Tue, 9 Aug 2016 20:21:03 +0000 (13:21 -0700)]
SF: Fix a couple of Layer ref count issues
This is an attempt at fixing two reference counting issues for Layers.
The first issue is that since we were holding an sp<IBinder> (really a
reference to a LayerCleaner) inside the layer state for deferred
transactions, there was a possibility that it could end up being the
last strong reference to the LayerCleaner such that when it was
destroyed while applying a non-deferred transaction, it would attempt
to grab the SurfaceFlinger main lock to destroy its Layer. Since this
occurred in the main SurfaceFlinger loop, which was already holding
the lock to process transactions, this would cause a deadlock.
To fix this, the sp<IBinder> inside the layer state was changed to a
wp<IBinder>, only being promoted when it actually needs to be accessed
(i.e., when the deferred transaction is created).
The second issue is that we were promoting and holding a strong
reference to a Layer before calling into SurfaceFlinger to destroy it
on the onLayerDestroyed path (triggered when a LayerCleaner is
destroyed). After returning from the attempt to grab the SurfaceFlinger
main lock, it was possible that this strong reference was the last one
keeping the Layer alive, and destroying it at this point could cause
the HWC2 version of the layer to be destroyed at effectively any point,
even between validate/present.
To fix this, the promotion of the weak Layer reference was moved inside
the critical section where the SurfaceFlinger main lock is held.
Bug:
30503916
Bug:
30281222
Change-Id: I1c6a271f9a7b5d6eea9a9db61d971f262d0cfe84
Irvel [Thu, 28 Jul 2016 18:23:08 +0000 (11:23 -0700)]
Fix duplicated VSync tracing in SurfaceInterceptor
Change-Id: Id02bb2916d0c53dc11d7106c4aec6954a1acc035
Irvel [Wed, 27 Jul 2016 22:16:37 +0000 (15:16 -0700)]
Add display tracing to SurfaceInterceptor
Change-Id: Iaae5a840ca7dca7a9a70dde1ccab0fa3944cd863
Irvel [Mon, 18 Jul 2016 15:42:29 +0000 (08:42 -0700)]
Add display tracing to the surfacecapturereplay proto
Change-Id: Ic1c5e092634fb32f05c513deab3e2b528566dc0c
TreeHugger Robot [Fri, 12 Aug 2016 19:41:48 +0000 (19:41 +0000)]
Merge "Created constant for maximun number of args."
Sahil Dhanju [Fri, 12 Aug 2016 19:34:46 +0000 (19:34 +0000)]
Merge "Added Display increments, more controls, and a readme to the replayer"
Sahil Dhanju [Tue, 9 Aug 2016 03:27:23 +0000 (20:27 -0700)]
Added Display increments, more controls, and a readme to the replayer
Change-Id: Id21144b7f808858149772de511951546fddfb252
Felipe Leme [Fri, 12 Aug 2016 17:51:54 +0000 (10:51 -0700)]
Created constant for maximun number of args.
BUG:
26379932
Change-Id: I839f6e3f90010ee35bc5d40e96218e9c95afdf4e
Dan Stoza [Fri, 12 Aug 2016 17:08:09 +0000 (17:08 +0000)]
Merge "DO NOT MERGE SF: Add property to disable HWC virtual displays" into nyc-mr1-dev am:
e26ce9f612 am:
c65a0ebf68
am:
f2cf7164f8 -s ours
Change-Id: Ic2006e408927037f2bce2fc799993ad939b16991
Dan Stoza [Fri, 12 Aug 2016 17:08:09 +0000 (17:08 +0000)]
DO NOT MERGE SF: Add property to disable HWC virtual displays am:
3cf4bfe236 am:
cce24b398c
am:
a807cd502e -s ours
Change-Id: I6db7acde91a8d884efda3d590468e009602479ee
Dan Stoza [Fri, 12 Aug 2016 16:47:29 +0000 (16:47 +0000)]
Merge "DO NOT MERGE SF: Add property to disable HWC virtual displays" into nyc-mr1-dev am:
e26ce9f612
am:
c65a0ebf68
Change-Id: Ie55679325194224637fe9bb312bed3d6e6fc34d2
Dan Stoza [Fri, 12 Aug 2016 16:47:28 +0000 (16:47 +0000)]
DO NOT MERGE SF: Add property to disable HWC virtual displays am:
3cf4bfe236
am:
cce24b398c
Change-Id: I0eb9092b3f09b607bb4d2da5d5533867d6ef1ebd
Dan Stoza [Fri, 12 Aug 2016 16:44:25 +0000 (16:44 +0000)]
Merge "DO NOT MERGE SF: Add property to disable HWC virtual displays" into nyc-mr1-dev
am:
e26ce9f612
Change-Id: I2976ce23d74de6cdaa2285c39d13d2a80e5eaf7a
Dan Stoza [Fri, 12 Aug 2016 16:44:25 +0000 (16:44 +0000)]
DO NOT MERGE SF: Add property to disable HWC virtual displays
am:
3cf4bfe236
Change-Id: I615cdf9466cbb37d32890f126dc0be1fecf9a50a
Dan Stoza [Fri, 12 Aug 2016 16:36:04 +0000 (16:36 +0000)]
Merge "DO NOT MERGE SF: Add property to disable HWC virtual displays" into nyc-mr1-dev
Sahil Dhanju [Thu, 11 Aug 2016 17:58:46 +0000 (17:58 +0000)]
Merge "Python utility that creates a trace file to be consumed by replayer"
Sahil Dhanju [Wed, 8 Jun 2016 03:10:39 +0000 (20:10 -0700)]
Python utility that creates a trace file to be consumed by replayer
Change-Id: Ibf566fce26273c92d52de0644ac06496dff74f59
Dan Stoza [Tue, 2 Aug 2016 17:27:31 +0000 (10:27 -0700)]
DO NOT MERGE SF: Add property to disable HWC virtual displays
Adds the property debug.sf.disable_hwc_vds, which will disable the use
of Hardware Composer virtual displays inside SurfaceFlinger (falling
back to SurfaceFlinger management and client composition of such
displays).
Also adds a Binder debug interface for controlling this behavior.
Bug:
30510632
Change-Id: I2c1a199213a24195b144bfa0c0f1679f2dfd0668
Dan Stoza [Tue, 2 Aug 2016 17:27:31 +0000 (10:27 -0700)]
SF: Add property to disable HWC virtual displays
Adds the property debug.sf.disable_hwc_vds, which will disable the use
of Hardware Composer virtual displays inside SurfaceFlinger (falling
back to SurfaceFlinger management and client composition of such
displays).
Also adds a Binder debug interface for controlling this behavior.
Bug:
30510632
Change-Id: I2c1a199213a24195b144bfa0c0f1679f2dfd0668
Kalle Raita [Wed, 10 Aug 2016 17:12:37 +0000 (17:12 +0000)]
Merge "Increase YV12BufferPow2 test threshold"
Dan Stoza [Tue, 9 Aug 2016 23:38:10 +0000 (23:38 +0000)]
Revert "SF: Fix a couple of Layer ref count issues"
This reverts commit
92cd24e5f648175944deef5899258981807a9ca4.
Change-Id: I551c292d8151d39bd34f2667eda384273f7cfd87
Dan Stoza [Tue, 9 Aug 2016 22:36:01 +0000 (22:36 +0000)]
Merge "SF: Fix a couple of Layer ref count issues" into nyc-mr1-dev am:
1ff2b85b03 am:
31212b5015
am:
873c0d5a49
Change-Id: I5c0fe8d4d7bb03c919ab8f30ece94505bf81687a
Dan Stoza [Tue, 9 Aug 2016 22:36:01 +0000 (22:36 +0000)]
SF: Fix a couple of Layer ref count issues am:
92cd24e5f6 am:
56e16bb1ca
am:
263910d00a
Change-Id: I76564ea2195d2de9aaf00ebd4c50db1d36dafeff
Dan Stoza [Tue, 9 Aug 2016 22:32:59 +0000 (22:32 +0000)]
Merge "SF: Fix a couple of Layer ref count issues" into nyc-mr1-dev am:
1ff2b85b03
am:
31212b5015
Change-Id: I8da2be987f367aa5cc97fae9508cac56b3edd6a6
Dan Stoza [Tue, 9 Aug 2016 22:32:58 +0000 (22:32 +0000)]
SF: Fix a couple of Layer ref count issues am:
92cd24e5f6
am:
56e16bb1ca
Change-Id: I64cac41e0f6e6412a3334cf17c15c9b754f8dd07
Dan Stoza [Tue, 9 Aug 2016 22:29:58 +0000 (22:29 +0000)]
Merge "SF: Fix a couple of Layer ref count issues" into nyc-mr1-dev
am:
1ff2b85b03
Change-Id: Iac13fc45e6b5e5dd469ffd42394aa64a65f3d457
Dan Stoza [Tue, 9 Aug 2016 22:29:58 +0000 (22:29 +0000)]
SF: Fix a couple of Layer ref count issues
am:
92cd24e5f6
Change-Id: Ia62ec102448136979df26ba907bfb1852d4d0373
Dan Stoza [Tue, 9 Aug 2016 22:25:37 +0000 (22:25 +0000)]
Merge "SF: Fix a couple of Layer ref count issues" into nyc-mr1-dev
Arve Hjnnevg [Tue, 9 Aug 2016 21:38:41 +0000 (21:38 +0000)]
DO NOT MERGE ServiceManager: Restore basic uid check am:
eb304f0a36 -s ours am:
a82f82293a am:
1c220583e4 am:
ce472fbb54 -s ours am:
e8cb9c8982 am:
1414d7b372 am:
b8d937caeb am:
1864a8748d -s ours am:
a4ef62b859 am:
27f9c82730 am:
cb69c31db8
am:
894969f402 -s ours
Change-Id: Ia621206058f23a5390c3717b1393122225be34f4
Arve Hjnnevg [Tue, 9 Aug 2016 21:38:41 +0000 (21:38 +0000)]
DO NOT MERGE ServiceManager: Restore basic uid check am:
247ae46340 am:
171ab27931 am:
101c678909 -s ours am:
e55418a857 am:
419626b496 am:
12151706b2 am:
899d956cf3 -s ours am:
66818cfeae am:
d3866c201b am:
a30a8d075c
am:
c1f3168ac4 -s ours
Change-Id: Ib9613ba55e4f6f3a887956defc77a16f0c8d08a4
Arve Hjnnevg [Tue, 9 Aug 2016 21:38:40 +0000 (21:38 +0000)]
DO NOT MERGE ServiceManager: Restore basic uid check am:
eb304f0a36 -s ours am:
a82f82293a am:
1c220583e4 am:
ce472fbb54 -s ours am:
e8cb9c8982 am:
1414d7b372 am:
b8d937caeb am:
1864a8748d -s ours am:
a4ef62b859 am:
0869559543
am:
2b0a6558ac -s ours
Change-Id: I14fac5817d5e1b45c8740b8821b39a77a89732f2
Arve Hjnnevg [Tue, 9 Aug 2016 21:38:39 +0000 (21:38 +0000)]
DO NOT MERGE ServiceManager: Restore basic uid check am:
247ae46340 am:
171ab27931 am:
101c678909 -s ours am:
e55418a857 am:
419626b496 am:
12151706b2 am:
899d956cf3 -s ours am:
66818cfeae am:
f10b164b00
am:
8e64c9075d -s ours
Change-Id: I226ff2ceed93dadea23c527c0d3a70192bc42006
Arve Hjnnevg [Tue, 9 Aug 2016 21:30:23 +0000 (21:30 +0000)]
DO NOT MERGE ServiceManager: Restore basic uid check am:
eb304f0a36 -s ours am:
a82f82293a am:
1c220583e4 am:
ce472fbb54 -s ours am:
e8cb9c8982 am:
1414d7b372 am:
b8d937caeb am:
1864a8748d -s ours am:
a4ef62b859 am:
27f9c82730
am:
cb69c31db8
Change-Id: I5d3be52f6a7fd507072fbe4f4bad07c2714ad9da
Arve Hjnnevg [Tue, 9 Aug 2016 21:30:22 +0000 (21:30 +0000)]
DO NOT MERGE ServiceManager: Restore basic uid check am:
247ae46340 am:
171ab27931 am:
101c678909 -s ours am:
e55418a857 am:
419626b496 am:
12151706b2 am:
899d956cf3 -s ours am:
66818cfeae am:
d3866c201b
am:
a30a8d075c
Change-Id: I276610212da97412d541b87ab73b275d24f94e64
Arve Hjnnevg [Tue, 9 Aug 2016 21:24:26 +0000 (21:24 +0000)]
DO NOT MERGE ServiceManager: Restore basic uid check am:
eb304f0a36 -s ours am:
a82f82293a am:
1c220583e4 am:
ce472fbb54 -s ours am:
e8cb9c8982 am:
1414d7b372 am:
b8d937caeb am:
1864a8748d -s ours am:
a4ef62b859
am:
27f9c82730
Change-Id: I2187dc6218065463b04bdb49a65754ad89ed28b2
Arve Hjnnevg [Tue, 9 Aug 2016 21:24:26 +0000 (21:24 +0000)]
DO NOT MERGE ServiceManager: Restore basic uid check am:
247ae46340 am:
171ab27931 am:
101c678909 -s ours am:
e55418a857 am:
419626b496 am:
12151706b2 am:
899d956cf3 -s ours am:
66818cfeae
am:
d3866c201b
Change-Id: If5210c25834538adb53c6f8b8310cfda18c3478e
Arve Hjnnevg [Tue, 9 Aug 2016 21:24:25 +0000 (21:24 +0000)]
DO NOT MERGE ServiceManager: Restore basic uid check am:
eb304f0a36 -s ours am:
a82f82293a am:
1c220583e4 am:
ce472fbb54 -s ours am:
e8cb9c8982 am:
1414d7b372 am:
b8d937caeb am:
1864a8748d -s ours am:
a4ef62b859
am:
0869559543
Change-Id: Id5dbe1d076ba8c53fe9097ed251f16d13f448316
Arve Hjnnevg [Tue, 9 Aug 2016 21:24:24 +0000 (21:24 +0000)]
DO NOT MERGE ServiceManager: Restore basic uid check am:
247ae46340 am:
171ab27931 am:
101c678909 -s ours am:
e55418a857 am:
419626b496 am:
12151706b2 am:
899d956cf3 -s ours am:
66818cfeae
am:
f10b164b00
Change-Id: I13bcf7dc4fa7acf44156510f073065d7c0881052
Arve Hjnnevg [Tue, 9 Aug 2016 21:22:26 +0000 (21:22 +0000)]
DO NOT MERGE ServiceManager: Restore basic uid check am:
eb304f0a36 -s ours am:
a82f82293a am:
1c220583e4 am:
ce472fbb54 -s ours am:
e8cb9c8982 am:
1414d7b372 am:
b8d937caeb am:
1864a8748d -s ours
am:
a4ef62b859
Change-Id: Ia01791f2f6a16f4484fa0f965daf598d8a5bb30b
Arve Hjnnevg [Tue, 9 Aug 2016 21:22:25 +0000 (21:22 +0000)]
DO NOT MERGE ServiceManager: Restore basic uid check am:
eb304f0a36 -s ours am:
a82f82293a am:
1c220583e4 am:
ce472fbb54 -s ours am:
e8cb9c8982 am:
1414d7b372 am:
b8d937caeb am:
1864a8748d -s ours
am:
a4ef62b859
Change-Id: I471e71c1abbb065d2e3c87671dadbff614fc4a9d
Arve Hjnnevg [Tue, 9 Aug 2016 21:18:53 +0000 (21:18 +0000)]
DO NOT MERGE ServiceManager: Restore basic uid check am:
eb304f0a36 -s ours am:
a82f82293a am:
1c220583e4 am:
ce472fbb54 -s ours am:
e8cb9c8982 am:
1414d7b372 am:
b8d937caeb
am:
1864a8748d -s ours
Change-Id: I2e022f5c528ded283a40ad3e3a4ac230070a242b
Arve Hjnnevg [Tue, 9 Aug 2016 21:16:24 +0000 (21:16 +0000)]
DO NOT MERGE ServiceManager: Restore basic uid check am:
247ae46340 am:
171ab27931 am:
101c678909 -s ours am:
e55418a857 am:
419626b496 am:
12151706b2 am:
899d956cf3 -s ours
am:
66818cfeae
Change-Id: Ie8be0fb9b943e5bc8b1046e8e3eb3384e52b223a
Arve Hjnnevg [Tue, 9 Aug 2016 21:16:24 +0000 (21:16 +0000)]
DO NOT MERGE ServiceManager: Restore basic uid check am:
247ae46340 am:
171ab27931 am:
101c678909 -s ours am:
e55418a857 am:
419626b496 am:
12151706b2 am:
899d956cf3 -s ours
am:
66818cfeae
Change-Id: Ide7a6b47d4a0027203741f12c8229ba3948cb3c0
Arve Hjnnevg [Tue, 9 Aug 2016 21:16:23 +0000 (21:16 +0000)]
DO NOT MERGE ServiceManager: Restore basic uid check am:
eb304f0a36 -s ours am:
a82f82293a am:
1c220583e4 am:
ce472fbb54 -s ours am:
e8cb9c8982 am:
1414d7b372
am:
b8d937caeb
Change-Id: I82f6a95334c5c8e484260f120b54ac1d386274da
Arve Hjnnevg [Tue, 9 Aug 2016 21:13:23 +0000 (21:13 +0000)]
DO NOT MERGE ServiceManager: Restore basic uid check am:
eb304f0a36 -s ours am:
a82f82293a am:
1c220583e4 am:
ce472fbb54 -s ours am:
e8cb9c8982
am:
1414d7b372
Change-Id: I50541ba686cafded699568f710627bf3e4f8aa1d
Arve Hjnnevg [Tue, 9 Aug 2016 21:10:39 +0000 (21:10 +0000)]
Merge "DO NOT MERGE ServiceManager: Restore basic uid check am:
f03ba2c0d8 am:
a9963dcfb7 am:
cac59eae3b am:
0c63d9490c -s ours am:
cc453b9926 am:
d0081e169c" into nyc-mr1-dev-plus-aosp
am:
7ce2f280b7 -s ours
Change-Id: Ia90a4a0aa9f0d7674b5369748f2de9b2890b0bb5
Arve Hjnnevg [Tue, 9 Aug 2016 21:10:38 +0000 (21:10 +0000)]
DO NOT MERGE ServiceManager: Restore basic uid check am:
f03ba2c0d8 am:
a9963dcfb7 am:
cac59eae3b am:
0c63d9490c -s ours am:
cc453b9926 am:
d0081e169c
am:
2dad9c33e9 -s ours
Change-Id: I74fb43ac7f0a3f1399501422e3958f447dec109f
Arve Hjnnevg [Tue, 9 Aug 2016 21:10:37 +0000 (21:10 +0000)]
DO NOT MERGE ServiceManager: Restore basic uid check am:
f03ba2c0d8 am:
a9963dcfb7 am:
cac59eae3b am:
0c63d9490c -s ours am:
cc453b9926 am:
8ea9d9a8f9 am:
ec6d0ac5c7
am:
a1d8d3815d -s ours
Change-Id: I1154852f984a130704174131132377e2fbe7986b
Arve Hjnnevg [Tue, 9 Aug 2016 21:10:26 +0000 (21:10 +0000)]
DO NOT MERGE ServiceManager: Restore basic uid check am:
247ae46340 am:
171ab27931 am:
101c678909 -s ours am:
e55418a857 am:
419626b496 am:
12151706b2
am:
899d956cf3 -s ours
Change-Id: I107ec23f410d6ee30603596e4bd4b93c93619791
Arve Hjnnevg [Tue, 9 Aug 2016 21:10:26 +0000 (21:10 +0000)]
DO NOT MERGE ServiceManager: Restore basic uid check am:
eb304f0a36 -s ours am:
a82f82293a am:
1c220583e4 am:
ce472fbb54 -s ours
am:
e8cb9c8982
Change-Id: I9445235baf1ea98e3e47af3034fa49b0593ae1b2
Android Build Merger (Role) [Tue, 9 Aug 2016 21:07:43 +0000 (21:07 +0000)]
Merge "DO NOT MERGE ServiceManager: Restore basic uid check am:
f03ba2c0d8 am:
a9963dcfb7 am:
cac59eae3b am:
0c63d9490c -s ours am:
cc453b9926 am:
d0081e169c" into nyc-mr1-dev-plus-aosp
Arve Hjnnevg [Tue, 9 Aug 2016 21:07:37 +0000 (21:07 +0000)]
DO NOT MERGE ServiceManager: Restore basic uid check am:
f03ba2c0d8 am:
a9963dcfb7 am:
cac59eae3b am:
0c63d9490c -s ours am:
cc453b9926
am:
d0081e169c
Change-Id: I1f4369f036c4146ffe39f30f1e60e15c48e3cd37
Arve Hjnnevg [Tue, 9 Aug 2016 21:07:31 +0000 (21:07 +0000)]
DO NOT MERGE ServiceManager: Restore basic uid check am:
eb304f0a36 -s ours am:
a82f82293a am:
1c220583e4
am:
ce472fbb54 -s ours
Change-Id: I9ac9efe65b6985fc7bd4e7be8a37e471023bd450
Arve Hjnnevg [Tue, 9 Aug 2016 21:07:25 +0000 (21:07 +0000)]
DO NOT MERGE ServiceManager: Restore basic uid check am:
f03ba2c0d8 am:
a9963dcfb7 am:
cac59eae3b am:
0c63d9490c -s ours am:
cc453b9926 am:
8ea9d9a8f9
am:
ec6d0ac5c7
Change-Id: I4a2dca71addd5a3a5f442688a8314e5702497329
Arve Hjnnevg [Tue, 9 Aug 2016 21:07:23 +0000 (21:07 +0000)]
DO NOT MERGE ServiceManager: Restore basic uid check am:
247ae46340 am:
171ab27931 am:
101c678909 -s ours am:
e55418a857 am:
419626b496
am:
12151706b2
Change-Id: I0e550c834f988591d761a1830bee72e99be968f1
Arve Hjnnevg [Tue, 9 Aug 2016 21:04:24 +0000 (21:04 +0000)]
DO NOT MERGE ServiceManager: Restore basic uid check am:
f03ba2c0d8 am:
a9963dcfb7 am:
cac59eae3b am:
0c63d9490c -s ours
am:
cc453b9926
Change-Id: I6b8be55f4d748f243cb8aeddfb63d9b1740ee0ad
Arve Hjnnevg [Tue, 9 Aug 2016 21:04:24 +0000 (21:04 +0000)]
DO NOT MERGE ServiceManager: Restore basic uid check am:
247ae46340 am:
171ab27931 am:
101c678909 -s ours am:
e55418a857
am:
419626b496
Change-Id: Ibe41eb3a2c9a0e28211d546b6b79469bb0523d01
Arve Hjnnevg [Tue, 9 Aug 2016 21:04:24 +0000 (21:04 +0000)]
DO NOT MERGE ServiceManager: Restore basic uid check am:
eb304f0a36 -s ours am:
a82f82293a
am:
1c220583e4
Change-Id: Ie1ab626a476ecada3ed5171489dc3fec0cf5a1f5
Arve Hjnnevg [Tue, 9 Aug 2016 21:04:23 +0000 (21:04 +0000)]
DO NOT MERGE ServiceManager: Restore basic uid check am:
f03ba2c0d8 am:
a9963dcfb7 am:
cac59eae3b am:
0c63d9490c -s ours am:
cc453b9926
am:
8ea9d9a8f9
Change-Id: I3cbea8b6234ac366ac99dc45f57b54e0ddba1a11
Arve Hjnnevg [Tue, 9 Aug 2016 21:01:24 +0000 (21:01 +0000)]
DO NOT MERGE ServiceManager: Restore basic uid check am:
f03ba2c0d8 am:
a9963dcfb7 am:
cac59eae3b am:
0c63d9490c -s ours
am:
cc453b9926
Change-Id: Ib6cd35f8e1fbabfeca37626854eba9c927b120ca
Arve Hjnnevg [Tue, 9 Aug 2016 21:01:23 +0000 (21:01 +0000)]
DO NOT MERGE ServiceManager: Restore basic uid check am:
eb304f0a36 -s ours
am:
a82f82293a
Change-Id: Ib91d630f70f4fa434915ac15938c7dca94fe3de5
Arve Hjnnevg [Tue, 9 Aug 2016 20:58:32 +0000 (20:58 +0000)]
ServiceManager: Restore basic uid check am:
2b74d2c1d2 am:
3f505a247e am:
3c9535fe33
am:
f33c396366
Change-Id: I8465e01ad048b55f790d3ca01b4f53eb493c40cd
Arve Hjnnevg [Tue, 9 Aug 2016 20:58:24 +0000 (20:58 +0000)]
DO NOT MERGE ServiceManager: Restore basic uid check am:
f03ba2c0d8 am:
a9963dcfb7 am:
cac59eae3b
am:
0c63d9490c -s ours
Change-Id: I2d17ab94a66c5ee9b5aa7d0bd8a89e31f39d7b9d
Arve Hjnnevg [Tue, 9 Aug 2016 20:58:24 +0000 (20:58 +0000)]
DO NOT MERGE ServiceManager: Restore basic uid check am:
247ae46340 am:
171ab27931 am:
101c678909 -s ours
am:
e55418a857
Change-Id: If0008ff56fb3348ac1bef2c77e99032bf6d51680
Arve Hjnnevg [Tue, 9 Aug 2016 20:55:31 +0000 (20:55 +0000)]
DO NOT MERGE ServiceManager: Restore basic uid check am:
247ae46340 am:
171ab27931
am:
101c678909 -s ours
Change-Id: I3c98fc1516193caab37bcb9cf88ffe6104dd65b1
Arve Hjnnevg [Tue, 9 Aug 2016 20:55:24 +0000 (20:55 +0000)]
ServiceManager: Restore basic uid check am:
2b74d2c1d2 am:
3f505a247e
am:
3c9535fe33
Change-Id: I80a483caaeb2e8497991c4311d943dc7e8a4a2be
Arve Hjnnevg [Tue, 9 Aug 2016 20:55:23 +0000 (20:55 +0000)]
DO NOT MERGE ServiceManager: Restore basic uid check
am:
eb304f0a36 -s ours
Change-Id: I6bae641d0ec80aaba79b716ef8bcd46279aca0ed
Arve Hjnnevg [Tue, 9 Aug 2016 20:55:19 +0000 (20:55 +0000)]
DO NOT MERGE ServiceManager: Restore basic uid check am:
f03ba2c0d8 am:
a9963dcfb7
am:
cac59eae3b
Change-Id: I672617263a66261b36de2f3fb6c7829d39f87e51
Arve Hjnnevg [Tue, 9 Aug 2016 20:52:19 +0000 (20:52 +0000)]
ServiceManager: Restore basic uid check am:
2b74d2c1d2
am:
3f505a247e
Change-Id: Iae46cadfc90e7f8e13657978fab4e01cefb5b9ba
Arve Hjnnevg [Tue, 9 Aug 2016 20:52:19 +0000 (20:52 +0000)]
ServiceManager: Restore basic uid check am:
2b74d2c1d2 am:
8039d6e068
am:
528544025c
Change-Id: I9dd1a4d36ff39f9de77c6c33e8cd36268f77c30b
Arve Hjnnevg [Tue, 9 Aug 2016 20:52:18 +0000 (20:52 +0000)]
DO NOT MERGE ServiceManager: Restore basic uid check am:
f03ba2c0d8
am:
a9963dcfb7
Change-Id: Id42cd61ca837cc5e9da644feaae10f8f7d0e6c11
Arve Hjnnevg [Tue, 9 Aug 2016 20:49:56 +0000 (20:49 +0000)]
ServiceManager: Restore basic uid check am:
2b74d2c1d2
am:
8039d6e068
Change-Id: I390b0dcc54c4bd949df775d82d267b14fe798e37
Arve Hjnnevg [Tue, 9 Aug 2016 20:49:54 +0000 (20:49 +0000)]
DO NOT MERGE ServiceManager: Restore basic uid check am:
247ae46340
am:
171ab27931
Change-Id: I3cfc70e8fb1dd393a92ace283d36ee2b35585ea4
Arve Hjnnevg [Tue, 9 Aug 2016 20:49:53 +0000 (20:49 +0000)]
ServiceManager: Restore basic uid check
am:
2b74d2c1d2
Change-Id: I01ebfcff30a8b25e3d8435b96bd437fb6e41f8a5
Dan Stoza [Tue, 9 Aug 2016 20:21:03 +0000 (13:21 -0700)]
SF: Fix a couple of Layer ref count issues
This is an attempt at fixing two reference counting issues for Layers.
The first issue is that since we were holding an sp<IBinder> (really a
reference to a LayerCleaner) inside the layer state for deferred
transactions, there was a possibility that it could end up being the
last strong reference to the LayerCleaner such that when it was
destroyed while applying a non-deferred transaction, it would attempt
to grab the SurfaceFlinger main lock to destroy its Layer. Since this
occurred in the main SurfaceFlinger loop, which was already holding
the lock to process transactions, this would cause a deadlock.
To fix this, the sp<IBinder> inside the layer state was changed to a
wp<IBinder>, only being promoted when it actually needs to be accessed
(i.e., when the deferred transaction is created).
The second issue is that we were promoting and holding a strong
reference to a Layer before calling into SurfaceFlinger to destroy it
on the onLayerDestroyed path (triggered when a LayerCleaner is
destroyed). After returning from the attempt to grab the SurfaceFlinger
main lock, it was possible that this strong reference was the last one
keeping the Layer alive, and destroying it at this point could cause
the HWC2 version of the layer to be destroyed at effectively any point,
even between validate/present.
To fix this, the promotion of the weak Layer reference was moved inside
the critical section where the SurfaceFlinger main lock is held.
Bug:
30503916
Bug:
30281222
Change-Id: I1c6a271f9a7b5d6eea9a9db61d971f262d0cfe84
Arve Hjnnevg [Tue, 9 Aug 2016 20:46:49 +0000 (20:46 +0000)]
DO NOT MERGE ServiceManager: Restore basic uid check
am:
247ae46340
Change-Id: I67af781d5876b13daca82cb7e947397c94cd62e7
Arve Hjnnevg [Tue, 9 Aug 2016 20:46:49 +0000 (20:46 +0000)]
DO NOT MERGE ServiceManager: Restore basic uid check
am:
f03ba2c0d8
Change-Id: I1435bfcd119116cdd242cf7714ef9535d7abc6fa
Arve Hjnnevg [Tue, 9 Aug 2016 20:46:48 +0000 (20:46 +0000)]
ServiceManager: Restore basic uid check
am:
2b74d2c1d2
Change-Id: I27c3515350a64177f2e1de2599fe48eda7b3a739
Arve Hjønnevåg [Mon, 1 Aug 2016 23:05:17 +0000 (16:05 -0700)]
DO NOT MERGE ServiceManager: Restore basic uid check
Prevent apps from registering services without relying on selinux checks.
Bug:
29431260
Change-Id: I38c6e8bc7f7cba1cbd3568e8fed1ae7ac2054a9b
Arve Hjønnevåg [Mon, 1 Aug 2016 23:05:17 +0000 (16:05 -0700)]
DO NOT MERGE ServiceManager: Restore basic uid check
Prevent apps from registering services without relying on selinux checks.
Bug:
29431260
Change-Id: I38c6e8bc7f7cba1cbd3568e8fed1ae7ac2054a9b
Arve Hjønnevåg [Mon, 1 Aug 2016 23:05:17 +0000 (16:05 -0700)]
DO NOT MERGE ServiceManager: Restore basic uid check
Prevent apps from registering services without relying on selinux checks.
Bug:
29431260
Change-Id: I38c6e8bc7f7cba1cbd3568e8fed1ae7ac2054a9b
Mathieu Chartier [Sat, 6 Aug 2016 03:23:23 +0000 (03:23 +0000)]
Merge "Don't use profiles with vm safe mode" into nyc-mr1-dev am:
cf6e673296 am:
98051e00c8
am:
a49aba78a2
Change-Id: I373324fcd553a98b5e15963048de8160166346f9
Mathieu Chartier [Sat, 6 Aug 2016 03:23:23 +0000 (03:23 +0000)]
Don't use profiles with vm safe mode am:
d46d37b8d4 am:
cc772f3f63
am:
fdddd1b57c
Change-Id: Iaa9b5d194692967d42a986f50f09e0c13016ca1c
Dan Willemsen [Sat, 6 Aug 2016 03:23:02 +0000 (03:23 +0000)]
resolve merge conflicts of
35ea9f8 to nyc-mr1-dev-plus-aosp
am:
f697bba2d3 -s ours
Change-Id: I239c55903ba240bbd9728372236c0db214a2cfbb
Mathieu Chartier [Sat, 6 Aug 2016 02:08:22 +0000 (02:08 +0000)]
Merge "Don't use profiles with vm safe mode" into nyc-mr1-dev am:
cf6e673296
am:
98051e00c8
Change-Id: Id8232d97b5b835c52c752998304387de5c355782
Mathieu Chartier [Sat, 6 Aug 2016 02:08:22 +0000 (02:08 +0000)]
Don't use profiles with vm safe mode am:
d46d37b8d4
am:
cc772f3f63
Change-Id: I086faba35309013f581f53439e90441e249a94e4
Mathieu Chartier [Sat, 6 Aug 2016 02:04:58 +0000 (02:04 +0000)]
Merge "Don't use profiles with vm safe mode" into nyc-mr1-dev
am:
cf6e673296
Change-Id: I2a8761cd74641e4cbec312b34536de6f33b50a09
Mathieu Chartier [Sat, 6 Aug 2016 02:04:58 +0000 (02:04 +0000)]
Don't use profiles with vm safe mode
am:
d46d37b8d4
Change-Id: Ib91e3020496903d43458fee944770744be918e2c
Mathieu Chartier [Sat, 6 Aug 2016 01:56:54 +0000 (01:56 +0000)]
Merge "Don't use profiles with vm safe mode" into nyc-mr1-dev
Mathieu Chartier [Sat, 6 Aug 2016 00:48:12 +0000 (17:48 -0700)]
Don't use profiles with vm safe mode
vm safe mode uses interpret only compiler filter, this filter will
generate a full app image if a profile is also passed down. App
image generation without a profile currently has a bug where uses
library is not pruned correctly.
Bug:
30688277
Change-Id: I60d87d698789583b8ab797eb47d031c96caf6d9b
Test: N5X boot, package compile speed-profile comb.BBClient
Dan Willemsen [Fri, 5 Aug 2016 23:08:04 +0000 (16:08 -0700)]
resolve merge conflicts of
35ea9f8 to nyc-mr1-dev-plus-aosp
Change-Id: I6f0ff0ecfd9c91adc46c059bab440aab6d666e62
Dan Willemsen [Fri, 5 Aug 2016 22:57:47 +0000 (22:57 +0000)]
resolve merge conflicts of
0783d5f to stage-aosp-master
am:
2a001e8bfe
Change-Id: Ib0fc16f4a35761c0b2a3e3273800e1f27e527577
Dan Willemsen [Fri, 5 Aug 2016 21:06:41 +0000 (14:06 -0700)]
resolve merge conflicts of
0783d5f to stage-aosp-master
Change-Id: I4fe9c0391d6d41bae5fbbb0df6e00e264e87649f
Dan Willemsen [Fri, 5 Aug 2016 20:44:52 +0000 (20:44 +0000)]
Merge "Start converting Android.mk to Android.bp"
Felipe Leme [Fri, 5 Aug 2016 20:32:02 +0000 (20:32 +0000)]
Merge "Revert "R.I.P. bugreport, long live bugreportz!""
OSDN Git Service
