commit eeb43fbd61adfc6511528e2e13fd5372a14e2831
author Kenny Guy <kennyguy@google.com> Thu Feb 05 15:26:09 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Feb 05 15:26:09 2015 +0000
tree d6dc0ece68f5d71ca894ee2c14f3f144662f83c7
parent 6708ac40f29c2437d3cb67ffa7604aecbdad1fe7
parent 8d12d3da15a92fde05256c51f8a3085ab9399c0f

am 8d12d3da: Merge "Only switch user if current user is being wiped" into lmp-mr1-dev

* commit '8d12d3da15a92fde05256c51f8a3085ab9399c0f':
  Only switch user if current user is being wiped

services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java

diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
index fd4c016..40e2056 100644
--- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
+++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
@@ -3049,7 +3049,10 @@
             mHandler.post(new Runnable() {
                 public void run() {
                     try {
-                        ActivityManagerNative.getDefault().switchUser(UserHandle.USER_OWNER);
+                        IActivityManager am = ActivityManagerNative.getDefault();
+                        if (am.getCurrentUser().id == userHandle) {
+                            am.switchUser(UserHandle.USER_OWNER);
+                        }
                         if (!mUserManager.removeUser(userHandle)) {
                             Slog.w(LOG_TAG, "Couldn't remove user " + userHandle);
                         }