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

Commit 68b33c37 authored by Peter Collingbourne's avatar Peter Collingbourne Committed by Automerger Merge Worker
Browse files

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

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13922246

Change-Id: I0613b718fc7a4a2d678a8eca5d9229810cb61ad7
parents e94dfb81 f1c8817e

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(