diff options
| author | Makoto Onuki <omakoto@google.com> | 2017-01-04 14:36:59 -0800 |
|---|---|---|
| committer | Sean McCreary <mccreary@mcwest.org> | 2017-04-06 16:27:03 -0600 |
| commit | d81dca8b1a4786940cfcb8c7aeba72ab541bd58a (patch) | |
| tree | 1821edceea0215ea66c580673c9d05a615c21126 /sax | |
| parent | e53c4cb312e5bd0f5ef8415a6c476e59f060b639 (diff) | |
| download | frameworks_base-d81dca8b1a4786940cfcb8c7aeba72ab541bd58a.zip frameworks_base-d81dca8b1a4786940cfcb8c7aeba72ab541bd58a.tar.gz frameworks_base-d81dca8b1a4786940cfcb8c7aeba72ab541bd58a.tar.bz2 | |
Do not call RecoverySystem with DPMS lock held
Note DPM.wipeData() on a secondary user is now blocking, just like
it's been always blocking on the primary user.
Test: Manually tested wipeData() with ApiDemos, both on 1) the primary user,
2) a secondary user and 3) work profile.
Test: adb shell am instrument -e class com.android.server.devicepolicy.DevicePolicyManagerTest -w com.android.frameworks.servicestests
Bug 30681079
AOSP-Change-Id: Ia832bed0f22396998d6307ab46e262dae9463838
Merged-in: Ib97a92a6af87a5589d2643b9ae0522395735e1a5
CVE-2017-0560
Change-Id: Icc6a5e655ed184e2a386e79bd5cf2c231f22e403
(cherry picked from commit efdec8f5688ce6b0a287eddb6d5dad93ffa0e1ee)
Diffstat (limited to 'sax')
0 files changed, 0 insertions, 0 deletions