tag 2d01c2cb66378c3f273bc1f284a1b9daa33ac52b
tagger The Android Open Source Project <initial-contribution@android.com> Mon Apr 03 09:54:38 2017 -0700
object a09bac1825c650ee999c69df9ab00f0478834bbe

Android 7.1.1 Release 35 (NOF27D)

commit a09bac1825c650ee999c69df9ab00f0478834bbe
author Makoto Onuki <omakoto@google.com> Wed Jan 04 14:36:59 2017 -0800
committer gitbuildkicker <android-build@google.com> Wed Feb 22 13:45:43 2017 -0800
tree 4ce46b40232db8bcf392f4d462b622bdfe166964
parent 364e0be9e15e9bcef7fbe33ff0b330228d4e861c

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)