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 am: c8af2bdcc5

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23451242

Change-Id: I631ae45d2db25b57be4439d343344107eb459bab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
TreeHugger Robot
2023-05-30 05:53:10 +00:00
committed by Automerger Merge Worker
parent 51de5978f3 c8af2bdcc5
commit 17a5594d47
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