tree 1b795497dc7ef9d9f41e1e950a6dc7b1e7bba5e6
parent 619294b1d29b0fe434069e5b2c122e8c128f6c96
author Makoto Onuki <omakoto@google.com> 1483569419 -0800
committer gitbuildkicker <android-build@google.com> 1487805036 -0800

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)
(cherry picked from commit 2317451acc84174cbe30d1899428d1b2953a4363)