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

Commit 7e4d5754 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: 20039e92 

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

Change-Id: Iafa371875397565ae9a13c825b32bf11408be407
parents 8ec54fe6 20039e92

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

+7 −4
Original line number Diff line number Diff line
@@ -562,6 +562,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);
@@ -678,10 +685,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);

            }