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

Commit 504e7531 authored by jovanak's avatar jovanak Committed by Jovana Knezevic
Browse files

Initialize mScreenLifecycle before user switcher gets created. 

Fixes:139682542
Test: turn screen on and off, set lockscreen, switch users
Change-Id: Id10b2e62230b5ee4e5a5ef7419a1500112673049
(cherry picked from commit 4c4971d0)
parent 0b1782d6

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

+5 −3
Original line number Diff line number Diff line
@@ -200,6 +200,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();
@@ -246,9 +251,6 @@ public class CarStatusBar extends StatusBar implements CarBatteryController.Batt 
        mPowerManagerHelper.connectToCarService();



        mSwitchToGuestTimer = new SwitchToGuestTimer(mContext);



        mScreenLifecycle = Dependency.get(ScreenLifecycle.class);

        mScreenLifecycle.addObserver(mScreenObserver);

    }



    /**