diff options
| author | Makoto Onuki <omakoto@google.com> | 2017-01-04 14:36:59 -0800 |
|---|---|---|
| committer | Makoto Onuki <omakoto@google.com> | 2017-01-27 14:08:01 -0800 |
| commit | efdec8f5688ce6b0a287eddb6d5dad93ffa0e1ee (patch) | |
| tree | 37c961518edd7ccf8f250d766757772918e40234 /tools/aapt2/diff/Diff.cpp | |
| parent | 56d29925acf566535738aa93f0397a43202eecc8 (diff) | |
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
Change-Id: Ia832bed0f22396998d6307ab46e262dae9463838
Merged-in: Ib97a92a6af87a5589d2643b9ae0522395735e1a5
Diffstat (limited to 'tools/aapt2/diff/Diff.cpp')
0 files changed, 0 insertions, 0 deletions