Merge "Fix behavior when config_guestUserAutoCreated=true" into sc-dev (3d123e4a) · Commits · e / os / android_frameworks_base

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

+43 −8

Original line number	Diff line number	Diff line
		@@ -131,6 +131,7 @@ public class UserSwitcherController implements Dumpable {
		public final DetailAdapter mUserDetailAdapter;
		private final Executor mUiBgExecutor;
		private final boolean mGuestUserAutoCreated;
		private final AtomicBoolean mGuestIsResetting;
		private final AtomicBoolean mGuestCreationScheduled;
		private FalsingManager mFalsingManager;

		@@ -160,6 +161,7 @@ public class UserSwitcherController implements Dumpable {
		}
		mGuestUserAutoCreated = mContext.getResources().getBoolean(
		com.android.internal.R.bool.config_guestUserAutoCreated);
		mGuestIsResetting = new AtomicBoolean();
		mGuestCreationScheduled = new AtomicBoolean();
		mKeyguardStateController = keyguardStateController;
		mHandler = handler;
		@@ -301,7 +303,20 @@ public class UserSwitcherController implements Dumpable {
		boolean createIsRestricted = !addUsersWhenLocked;

		if (guestRecord == null) {
		if (canCreateGuest) {
		if (mGuestUserAutoCreated) {
		// If mGuestIsResetting=true, the switch should be disabled since
		// we will just use it as an indicator for "Resetting guest...".
		// Otherwise, default to canSwitchUsers.
		boolean isSwitchToGuestEnabled =
		!mGuestIsResetting.get() && canSwitchUsers;
		guestRecord = new UserRecord(null /* info /, null / picture */,
		true /* isGuest /, false / isCurrent */,
		false /* isAddUser /, false / isRestricted */,
		isSwitchToGuestEnabled);
		// Don't call checkIfAddUserDisallowedByAdminOnly if
		// config_guestUserAutoCreated=true.
		records.add(guestRecord);
		} else if (canCreateGuest) {
		guestRecord = new UserRecord(null /* info /, null / picture */,
		true /* isGuest /, false / isCurrent */,
		false /* isAddUser */, createIsRestricted, canSwitchUsers);
		@@ -677,6 +692,9 @@ public class UserSwitcherController implements Dumpable {
		switchToUserId(newGuestId);
		mUserManager.removeUser(currentUser.id);
		} else {
		if (mGuestUserAutoCreated) {
		mGuestIsResetting.set(true);
		}
		switchToUserId(targetUserId);
		mUserManager.removeUser(currentUser.id);
		}
		@@ -693,10 +711,14 @@ public class UserSwitcherController implements Dumpable {

		mUiBgExecutor.execute(() -> {
		int newGuestId = createGuest();
		mGuestCreationScheduled.set(false);
		mGuestIsResetting.set(false);
		if (newGuestId == UserHandle.USER_NULL) {
		Log.w(TAG, "Could not create new guest while exiting existing guest");
		// Refresh users so that we still display "Guest" if
		// config_guestUserAutoCreated=true
		refreshUsers(UserHandle.USER_NULL);
		}
		mGuestCreationScheduled.set(false);
		});

		}
		@@ -799,12 +821,25 @@ public class UserSwitcherController implements Dumpable {
		? com.android.settingslib.R.string.guest_reset_guest
		: com.android.settingslib.R.string.guest_exit_guest);
		} else {
		// If config_guestUserAutoCreated, always show guest nickname instead of "Add
		// guest" to make it seem as though the device always has a guest ready for use
		if (item.info != null) {
		return context.getString(com.android.settingslib.R.string.guest_nickname);
		} else {
		if (mController.mGuestUserAutoCreated) {
		// If mGuestIsResetting=true, we expect the guest user to be created
		// shortly, so display a "Resetting guest..." as an indicator that we
		// are busy. Otherwise, if mGuestIsResetting=false, we probably failed
		// to create a guest at some point. In this case, always show guest
		// nickname instead of "Add guest" to make it seem as though the device
		// always has a guest ready for use.
		return context.getString(
		item.info == null && !mController.mGuestUserAutoCreated
		? com.android.settingslib.R.string.guest_new_guest
		mController.mGuestIsResetting.get()
		? com.android.settingslib.R.string.guest_resetting
		: com.android.settingslib.R.string.guest_nickname);
		} else {
		return context.getString(
		com.android.settingslib.R.string.guest_new_guest);
		}
		}
		}
		} else if (item.isAddUser) {
		return context.getString(R.string.user_add_user);