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

Commit af36b9eb authored by Alex Stetson's avatar Alex Stetson Committed by Automerger Merge Worker
Browse files

Merge "Check for null before using user switcher view" into tm-qpr-dev am: c32d4f43 

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



Change-Id: Ie26ae64065b5fec48d88d37490c7842729ab1936
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c663f204 c32d4f43

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

+6 −3
Original line number Diff line number Diff line
@@ -167,6 +167,7 @@ public class UserSwitcherController implements Dumpable { 
    private final AtomicBoolean mGuestIsResetting;

    private final AtomicBoolean mGuestCreationScheduled;

    private FalsingManager mFalsingManager;

    @Nullable

    private View mView;

    private String mCreateSupervisedUserPackage;

    private GlobalSettings mGlobalSettings;
@@ -572,9 +573,11 @@ public class UserSwitcherController implements Dumpable { 


    protected void switchToUserId(int id) {

        try {

            if (mView != null) {

                mInteractionJankMonitor.begin(InteractionJankMonitor.Configuration.Builder

                        .withView(InteractionJankMonitor.CUJ_USER_SWITCH, mView)

                        .setTimeout(MULTI_USER_JOURNEY_TIMEOUT));

            }

            mLatencyTracker.onActionStart(LatencyTracker.ACTION_USER_SWITCH);

            pauseRefreshUsers();

            mActivityManager.switchUser(id);