summaryrefslogtreecommitdiff
path: root/packages/SystemUI/src/com/android/systemui/BatteryMeterView.java
diff options
context:
space:
mode:
authorEvan Laird <evanlaird@google.com>2021-03-23 10:38:01 -0400
committerEvan Laird <evanlaird@google.com>2021-03-23 14:49:09 +0000
commitcd5ed7fa4151c65f6e568186ae13fb13caa9ee45 (patch)
tree881427ff05a2ce7998746edf3a939ecd130611ee /packages/SystemUI/src/com/android/systemui/BatteryMeterView.java
parent9db9a56c7e3a5042e4a85d1fb19d9379a89d34ce (diff)
Add null check to batterymeterview in case the percent view becomes null
Seems like this can only happen if we have a successful battery reading and then immediately the conditions change causing us to remove the precent view. Test: atest SystemUITests Fixes: 180019511 Change-Id: I4bf8508a9cef18ade62863b07086254e39897059
Diffstat (limited to 'packages/SystemUI/src/com/android/systemui/BatteryMeterView.java')
-rw-r--r--packages/SystemUI/src/com/android/systemui/BatteryMeterView.java3
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 cd53a34fbbc2..ac99f73f7cb9 100644
--- a/packages/SystemUI/src/com/android/systemui/BatteryMeterView.java
+++ b/packages/SystemUI/src/com/android/systemui/BatteryMeterView.java
@@ -349,6 +349,9 @@ public class BatteryMeterView extends LinearLayout implements
}
private void setPercentTextAtCurrentLevel() {
+ if (mBatteryPercentView == null) {
+ return;
+ }
mBatteryPercentView.setText(
NumberFormat.getPercentInstance().format(mLevel / 100f));
setContentDescription(