Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix crashloop in CarStatusBar."

Browse Source
This commit is contained in:
TreeHugger Robot
2017-01-24 04:04:34 +00:00
committed by Android (Google) Code Review
parent 9727f22fc0 545e47d758
commit 78b09a00a8
2 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/SystemUI/src/com/android/systemui/statusbar/car/CarStatusBar.java
View File

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

4
packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
View File

@@ -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(