From 08d520317e863c14f956ca6bfa8c35d402cc1be1 Mon Sep 17 00:00:00 2001
From: Zaiyue Xue <xuezaiyue@google.com>
Date: Tue, 30 May 2023 11:12:42 +0800
Subject: [PATCH] Fix b/284496479: Crash when opening App Info page

Bug: 284496479
Fix: 284496479
Test: presubmit
Change-Id: I900bd5ba334608f4c73556e802576c8aa45f5914
---
 .../src/com/android/settingslib/fuelgauge/BatteryStatus.java   | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/SettingsLib/src/com/android/settingslib/fuelgauge/BatteryStatus.java b/packages/SettingsLib/src/com/android/settingslib/fuelgauge/BatteryStatus.java
index 765566391ef24..1251b0dc306a9 100644
--- a/packages/SettingsLib/src/com/android/settingslib/fuelgauge/BatteryStatus.java
+++ b/packages/SettingsLib/src/com/android/settingslib/fuelgauge/BatteryStatus.java
@@ -196,6 +196,9 @@ public class BatteryStatus {
 
     /** Gets the battery level from the intent. */
     public static int getBatteryLevel(Intent batteryChangedIntent) {
+        if (batteryChangedIntent == null) {
+            return -1; /*invalid battery level*/
+        }
         final int level = batteryChangedIntent.getIntExtra(BatteryManager.EXTRA_LEVEL, -1);
         final int scale = batteryChangedIntent.getIntExtra(BatteryManager.EXTRA_SCALE, 0);
         return scale == 0