am a25bd32c: am 9011c4e7: am e6818f08: Merge "Don\'t turn off screen after wiping user profiles" into lmp-dev

* commit 'a25bd32c51c145cbf21e4842e1a8207e644483ee': Don't turn off screen after wiping user profiles
2014-07-30 16:54:10 +00:00
parent 3fe3e1a1a8 bc781ead1e
commit 059c83ce02
1 changed files with 1 additions and 3 deletions
--- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
+++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
@@ -2745,13 +2745,11 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {
        if (userHandle == UserHandle.USER_OWNER) {
            wipeDataLocked(flags);
        } else {
-            lockNowUnchecked();
            mHandler.post(new Runnable() {
                public void run() {
                    try {
                        ActivityManagerNative.getDefault().switchUser(UserHandle.USER_OWNER);
-                        (mUserManager)
-                                .removeUser(userHandle);
+                        mUserManager.removeUser(userHandle);
                    } catch (RemoteException re) {
                        // Shouldn't happen
                    }