commit 5be818cd3d198e4a88ec99a3ed0f8f269f52fb85
author Weijie Wang <weijiew@codeaurora.org> Mon Jun 28 19:09:14 2021 +0800
committer Weijie Wang <weijiew@codeaurora.org> Mon Jun 28 11:17:19 2021 +0000
tree 7d86a627573a19275a99a7c9447aa43a4bfebcf7
parent de7af7451ad7545fa7fcbb081878326fc3665ec3

SystemUI: Fix NPE in BatteryMeterView

Change-Id: I4c9281aadfd9befda2270d672187cca82bdc3d4c
CRs-Fixed: 2978962

packages/SystemUI/src/com/android/systemui/BatteryMeterView.java

diff --git a/packages/SystemUI/src/com/android/systemui/BatteryMeterView.java b/packages/SystemUI/src/com/android/systemui/BatteryMeterView.java
index a46ab3a..c9321e6 100644
--- a/packages/SystemUI/src/com/android/systemui/BatteryMeterView.java
+++ b/packages/SystemUI/src/com/android/systemui/BatteryMeterView.java
@@ -377,8 +377,10 @@
     }
 
     private void setPercentTextAtCurrentLevel() {
-        mBatteryPercentView.setText(
-                NumberFormat.getPercentInstance().format(mLevel / 100f));
+        if (mBatteryPercentView != null) {
+            mBatteryPercentView.setText(
+                    NumberFormat.getPercentInstance().format(mLevel / 100f));
+        }
         setContentDescription(
                 getContext().getString(mCharging ? R.string.accessibility_battery_level_charging
                         : R.string.accessibility_battery_level, mLevel));