diff options
| author | 2021-03-19 02:55:42 +0000 | |
|---|---|---|
| committer | 2021-03-19 02:55:42 +0000 | |
| commit | f1c8817e0fc8f377c405f5a86b68a6c7de97a5ac (patch) | |
| tree | a66ab0428cdb03b820cbbfdfbcc5c971f332b1a2 | |
| parent | 184a2845025635dc0f89d7445ebfdd0a15301997 (diff) | |
| parent | 2744b19f28ccdc9e2f1ade5fc1cad8a4a387dea8 (diff) | |
Merge "Add missing null check for mBatteryPercentView." into sc-dev
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/BatteryMeterView.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/BatteryMeterView.java b/packages/SystemUI/src/com/android/systemui/BatteryMeterView.java index 176562799838..cd53a34fbbc2 100644 --- 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( |