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

Commit c32d4f43 authored by Alex Stetson's avatar Alex Stetson Committed by Android (Google) Code Review
Browse files

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

parents 9b4eb480 416ec500

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);