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

Commit c1da99b4 authored by Jovana Knezevic's avatar Jovana Knezevic Committed by Android (Google) Code Review
Browse files

Merge "Initialize mScreenLifecycle before user switcher gets created."

parents f328adb0 4c4971d0

packages/CarSystemUI/src/com/android/systemui/statusbar/car/CarStatusBar.java

+5 −3
Original line number Diff line number Diff line
@@ -201,6 +201,11 @@ public class CarStatusBar extends StatusBar implements CarBatteryController.Batt 
                com.android.internal.R.bool.config_automotiveHideNavBarForKeyboard);

        mBottomNavBarVisible = false;



        // Need to initialize screen lifecycle before calling super.start - before switcher is

        // created.

        mScreenLifecycle = Dependency.get(ScreenLifecycle.class);

        mScreenLifecycle.addObserver(mScreenObserver);



        super.start();

        mTaskStackListener = new TaskStackListenerImpl();

        mActivityManagerWrapper = ActivityManagerWrapper.getInstance();
@@ -247,9 +252,6 @@ public class CarStatusBar extends StatusBar implements CarBatteryController.Batt 
        mPowerManagerHelper.connectToCarService();



        mSwitchToGuestTimer = new SwitchToGuestTimer(mContext);



        mScreenLifecycle = Dependency.get(ScreenLifecycle.class);

        mScreenLifecycle.addObserver(mScreenObserver);

    }



    /**