From 545e47d7585b0a9627ee860d489d776096d5f4d7 Mon Sep 17 00:00:00 2001
From: Rakesh Iyer <rni@google.com>
Date: Mon, 23 Jan 2017 18:10:21 -0800
Subject: [PATCH] Fix crashloop in CarStatusBar.

System ui seems to be undergoing a refactor to bring in
dependency injection, in the process, mBatteryController
in CarStatusBar was not being set, causing a NPE.

Since it looks like the work is still ongoing, this is
just a spot fix for the crash, once the dependency injection
migration is complete, we can reexamine the CarStatusBar
implementation.

Bug: 34633087
Test: Verified that system booted correctly.
Change-Id: Idd3e0286fd87196ae572349904d5bef744d54353
---
 .../src/com/android/systemui/statusbar/car/CarStatusBar.java  | 4 ++--
 .../com/android/systemui/statusbar/phone/PhoneStatusBar.java  | 4 ----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/car/CarStatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/car/CarStatusBar.java
index 93f72a8bdf789..f24e40b135785 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/car/CarStatusBar.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/car/CarStatusBar.java
@@ -72,6 +72,7 @@ public class CarStatusBar extends PhoneStatusBar implements
         SystemServicesProxy.getInstance(mContext).registerTaskStackListener(mTaskStackListener);
         registerPackageChangeReceivers();
 
+        createBatteryController();
         mCarBatteryController.startListening();
         mConnectedDeviceSignalController.startListening();
     }
@@ -113,8 +114,7 @@ public class CarStatusBar extends PhoneStatusBar implements
         return statusBarView;
     }
 
-    @Override
-    protected BatteryController createBatteryController() {
+    private BatteryController createBatteryController() {
         mCarBatteryController = new CarBatteryController(mContext);
         mCarBatteryController.addBatteryViewHandler(this);
         return mCarBatteryController;
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
index 80ad9d2d780ab..3291d591e8369 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
@@ -989,10 +989,6 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
         }
     }
 
-    protected BatteryController createBatteryController() {
-        return new BatteryControllerImpl(mContext);
-    }
-
     private void inflateShelf() {
         mNotificationShelf =
                 (NotificationShelf) LayoutInflater.from(mContext).inflate(