commit 504e75313df9d0b1c91e3f416964e5f3af37d181
author jovanak <jovanak@google.com> Mon Aug 19 16:32:50 2019 -0700
committer Jovana Knezevic <jovanak@google.com> Tue Sep 10 23:33:02 2019 +0000
tree ff9423d60645ddcf64796f8b4fa90246f011c979
parent 0b1782d6b4626e3ecea264b8f5ee074e89f0279d

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 4c4971d04ae12c5c19c20aeb296592e9a9f99c0e)

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

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 2a55ff0..25191f6 100644
--- a/packages/CarSystemUI/src/com/android/systemui/statusbar/car/CarStatusBar.java
+++ b/packages/CarSystemUI/src/com/android/systemui/statusbar/car/CarStatusBar.java
@@ -200,6 +200,11 @@
                 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 @@
         mPowerManagerHelper.connectToCarService();
 
         mSwitchToGuestTimer = new SwitchToGuestTimer(mContext);
-
-        mScreenLifecycle = Dependency.get(ScreenLifecycle.class);
-        mScreenLifecycle.addObserver(mScreenObserver);
     }
 
     /**