summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author jovanak <jovanak@google.com> 2019-08-19 16:32:50 -0700
committer jovanak <jovanak@google.com> 2019-08-19 16:43:17 -0700
commit4c4971d04ae12c5c19c20aeb296592e9a9f99c0e (patch)
tree69d322a7e4818567289fd3c1ce836fe290eb29fc
parent51e47a544b652ab79d42aa0839b32b3e87215bd6 (diff)
Initialize mScreenLifecycle before user switcher gets created.
Fixes:139682542 Test: turn screen on and off, set lockscreen, switch users Change-Id: Id10b2e62230b5ee4e5a5ef7419a1500112673049
-rw-r--r--packages/CarSystemUI/src/com/android/systemui/statusbar/car/CarStatusBar.java8
1 files changed, 5 insertions, 3 deletions
diff --git a/packages/CarSystemUI/src/com/android/systemui/statusbar/car/CarStatusBar.java b/packages/CarSystemUI/src/com/android/systemui/statusbar/car/CarStatusBar.java
index e95103bcb929..68b1ffe94b18 100644
--- a/packages/CarSystemUI/src/com/android/systemui/statusbar/car/CarStatusBar.java
+++ b/packages/CarSystemUI/src/com/android/systemui/statusbar/car/CarStatusBar.java
@@ -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);
}
/**