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

Commit 83d8c1f9 authored by Jovana Knezevic's avatar Jovana Knezevic Committed by android-build-merger
Browse files

Merge "Initialize mScreenLifecycle before user switcher gets created." into qt-qpr1-dev 

am: f6a90fd2

Change-Id: I594a15ebcb0efd40b8df7dd412ce588f0f8e869c
parents 8fc0593d f6a90fd2

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

    }



    /**