Merge "Initialize mScreenLifecycle before user switcher gets created."
This commit is contained in:
committed by
Android (Google) Code Review
commit
c1da99b427
@@ -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);
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
Reference in New Issue
Block a user