Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 78b09a00 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix crashloop in CarStatusBar."

parents 9727f22f 545e47d7

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

+2 −2
Original line number Diff line number Diff line
@@ -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;

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

+0 −4
Original line number Diff line number Diff line
@@ -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(