Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit '8d12d3da15a92fde05256c51f8a3085ab9399c0f':
  Only switch user if current user is being wiped
This commit is contained in:
Kenny Guy
2015-02-05 15:26:09 +00:00
committed by Android Git Automerger
parent 6708ac40f2 8d12d3da15
commit eeb43fbd61
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
View File

@@ -3049,7 +3049,10 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {
mHandler.post(new Runnable() { mHandler.post(new Runnable() {
public void run() { public void run() {
try { 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)) { if (!mUserManager.removeUser(userHandle)) {
Slog.w(LOG_TAG, "Couldn't remove user " + userHandle); Slog.w(LOG_TAG, "Couldn't remove user " + userHandle);
} }