Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 75fbd095 authored by Peter Kalauskas's avatar Peter Kalauskas Committed by Automerger Merge Worker
Browse files

Merge "Fix bug that caused task to show behind keyguard" into sc-dev am: b2487187 am: 17b6650d 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15349269

Change-Id: Ied3b7b7be704f05933ff6152c3c66fa8e43b57d5
parents 655d9e3e 17b6650d

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

+7 −4
Original line number Original line Diff line number Diff line
@@ -539,6 +539,13 @@ public class UserSwitcherController implements Dumpable { 
                    mSecondaryUser = userInfo.id;

                    mSecondaryUser = userInfo.id;

                }

                }

                unpauseRefreshUsers = true;

                unpauseRefreshUsers = true;

                if (mGuestUserAutoCreated) {

                    // Guest user must be scheduled for creation AFTER switching to the target user.

                    // This avoids lock contention which will produce UX bugs on the keyguard

                    // (b/193933686).

                    // TODO(b/191067027): Move guest user recreation to system_server

                    guaranteeGuestPresent();

                }

            } else if (Intent.ACTION_USER_INFO_CHANGED.equals(intent.getAction())) {

            } else if (Intent.ACTION_USER_INFO_CHANGED.equals(intent.getAction())) {

                forcePictureLoadForId = intent.getIntExtra(Intent.EXTRA_USER_HANDLE,

                forcePictureLoadForId = intent.getIntExtra(Intent.EXTRA_USER_HANDLE,

                        UserHandle.USER_NULL);

                        UserHandle.USER_NULL);
@@ -670,10 +677,6 @@ public class UserSwitcherController implements Dumpable { 
                switchToUserId(newGuestId);

                switchToUserId(newGuestId);

                mUserManager.removeUser(currentUser.id);

                mUserManager.removeUser(currentUser.id);

            } else {

            } else {

                if (mGuestUserAutoCreated) {

                    // TODO(b/191067027): Move guest recreation to system_server

                    scheduleGuestCreation();

                }

                switchToUserId(targetUserId);

                switchToUserId(targetUserId);

                mUserManager.removeUser(currentUser.id);

                mUserManager.removeUser(currentUser.id);

            }

            }