diff options
| author | Makoto Onuki <omakoto@google.com> | 2017-01-04 14:36:59 -0800 |
|---|---|---|
| committer | Suprabh Shukla <suprabh@google.com> | 2017-01-31 21:21:36 +0000 |
| commit | 2317451acc84174cbe30d1899428d1b2953a4363 (patch) | |
| tree | 91ea7994e7ba865a2ba17366da8a52cb49995b4e /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | f98ed6863a7f64c535a66006852a934b05d550bc (diff) | |
DO NOT MERGE 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: Ia832bed0f22396998d6307ab46e262dae9463838
(cherry picked from commit efdec8f5688ce6b0a287eddb6d5dad93ffa0e1ee)
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions