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

2021-03-19 02:55:42 +00:00
parent 184a284502 2744b19f28
commit f1c8817e0f
1 changed files with 3 additions and 0 deletions
--- a/packages/SystemUI/src/com/android/systemui/BatteryMeterView.java
+++ b/packages/SystemUI/src/com/android/systemui/BatteryMeterView.java
@@ -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(