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

am 7c4f7ba1: am 1faf174a: Guest: Switch back to previous user when exiting

Browse Source 
* commit '7c4f7ba1af2e2378d22e89a31c215537af61cd4e':
  Guest: Switch back to previous user when exiting
This commit is contained in:
Adrian Roos
2014-07-22 15:27:15 +00:00
committed by Android Git Automerger
parent 5c286c8901 37dc6ad6a4
commit a4dc5bac14
1 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
packages/SystemUI/src/com/android/systemui/statusbar/policy/UserSwitcherController.java
View File

@@ -66,6 +66,7 @@ public class UserSwitcherController {
private ArrayList<UserRecord> mUsers = new ArrayList<>();
private Dialog mExitGuestDialog;
private int mLastNonGuestUser = UserHandle.USER_OWNER;
public UserSwitcherController(Context context) {
mContext = context;
@@ -204,7 +205,14 @@ public class UserSwitcherController {
}
private void exitGuest(int id) {
switchToUserId(UserHandle.USER_OWNER);
int newId = UserHandle.USER_OWNER;
if (mLastNonGuestUser != UserHandle.USER_OWNER) {
UserInfo info = mUserManager.getUserInfo(mLastNonGuestUser);
if (info != null && info.isEnabled() && info.supportsSwitchTo()) {
newId = info.id;
}
}
switchToUserId(newId);
mUserManager.removeUser(id);
}
@@ -230,6 +238,9 @@ public class UserSwitcherController {
if (record.isCurrent != shouldBeCurrent) {
mUsers.set(i, record.copyWithIsCurrent(shouldBeCurrent));
}
if (shouldBeCurrent && !record.isGuest) {
mLastNonGuestUser = record.info.id;
}
}
notifyAdapters();
}
@@ -244,6 +255,7 @@ public class UserSwitcherController {
public void dump(FileDescriptor fd, PrintWriter pw, String[] args) {
pw.println("UserSwitcherController state:");
pw.println(" mLastNonGuestUser=" + mLastNonGuestUser);
pw.print(" mUsers.size="); pw.println(mUsers.size());
for (int i = 0; i < mUsers.size(); i++) {
final UserRecord u = mUsers.get(i);