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

Commit 17b6650d 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 

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

Change-Id: I9c04621651ba559562f7b65d0298f28c1c4beb23
parents a251e5a9 b2487187

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

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

                }

                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())) {

                forcePictureLoadForId = intent.getIntExtra(Intent.EXTRA_USER_HANDLE,

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

                mUserManager.removeUser(currentUser.id);

            } else {

                if (mGuestUserAutoCreated) {

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

                    scheduleGuestCreation();

                }

                switchToUserId(targetUserId);

                mUserManager.removeUser(currentUser.id);

            }