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

Merge "Make it possible to remove current user" into lmp-dev

Browse Source
This commit is contained in:
Amith Yamasani
2014-09-02 17:21:57 +00:00
committed by Android (Google) Code Review
parent 17a1b48629 1df1473008
commit 2cdcc7d360
5 changed files with 77 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
packages/SystemUI/src/com/android/systemui/GuestResumeSessionReceiver.java
View File

@@ -112,17 +112,23 @@ public class GuestResumeSessionReceiver extends BroadcastReceiver {
return;
}
userManager.removeUser(currentUser.id);
boolean marked = userManager.markGuestForDeletion(currentUser.id);
if (!marked) {
Log.w(TAG, "Couldn't mark the guest for deletion for user " + userId);
return;
}
UserInfo newGuest = userManager.createGuest(context, currentUser.name);
try {
if (newGuest == null) {
Log.e(TAG, "Could not create new guest, switching back to owner");
ActivityManagerNative.getDefault().switchUser(UserHandle.USER_OWNER);
userManager.removeUser(currentUser.id);
WindowManagerGlobal.getWindowManagerService().lockNow(null /* options */);
return;
}
ActivityManagerNative.getDefault().switchUser(newGuest.id);
userManager.removeUser(currentUser.id);
} catch (RemoteException e) {
Log.e(TAG, "Couldn't wipe session because ActivityManager or WindowManager is dead");
return;