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

Commit f1c8817e authored by Peter Collingbourne's avatar Peter Collingbourne Committed by Android (Google) Code Review
Browse files

Merge "Add missing null check for mBatteryPercentView." into sc-dev

parents 184a2845 2744b19f

packages/SystemUI/src/com/android/systemui/BatteryMeterView.java

+3 −0
Original line number Diff line number Diff line
@@ -326,6 +326,9 @@ public class BatteryMeterView extends LinearLayout implements 
        if (mBatteryPercentView != null) {

            if (mShowPercentMode == MODE_ESTIMATE && !mCharging) {

                mBatteryController.getEstimatedTimeRemainingString((String estimate) -> {

                    if (mBatteryPercentView == null) {

                        return;

                    }

                    if (estimate != null) {

                        mBatteryPercentView.setText(estimate);

                        setContentDescription(getContext().getString(