Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix b/284496479: Crash when opening App Info page" into udc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2023-05-30 05:10:35 +00:00
committed by Android (Google) Code Review
parent cd68a55e1b 08d520317e
commit c8af2bdcc5
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
packages/SettingsLib/src/com/android/settingslib/fuelgauge/BatteryStatus.java
View File

@@ -196,6 +196,9 @@ public class BatteryStatus {
/** Gets the battery level from the intent. */ /** Gets the battery level from the intent. */
public static int getBatteryLevel(Intent batteryChangedIntent) { 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 level = batteryChangedIntent.getIntExtra(BatteryManager.EXTRA_LEVEL, -1);
final int scale = batteryChangedIntent.getIntExtra(BatteryManager.EXTRA_SCALE, 0); final int scale = batteryChangedIntent.getIntExtra(BatteryManager.EXTRA_SCALE, 0);
return scale == 0 return scale == 0