From cd5ed7fa4151c65f6e568186ae13fb13caa9ee45 Mon Sep 17 00:00:00 2001
From: Evan Laird <evanlaird@google.com>
Date: Tue, 23 Mar 2021 10:38:01 -0400
Subject: [PATCH] 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
---
 .../SystemUI/src/com/android/systemui/BatteryMeterView.java    | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/SystemUI/src/com/android/systemui/BatteryMeterView.java b/packages/SystemUI/src/com/android/systemui/BatteryMeterView.java
index cd53a34fbbc2b..ac99f73f7cb97 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(