diff options
| author | 2023-08-18 02:39:34 +0000 | |
|---|---|---|
| committer | 2023-08-18 02:39:34 +0000 | |
| commit | 81b656e7d2d74368bede8af5fc1187bf4c0151e4 (patch) | |
| tree | 7d01d6fadee19d47eb0816a23230c0e8fb970c2f | |
| parent | 6dcf14f62ef52a42aba6428f3c26a870b6716a77 (diff) | |
| parent | 73efdc966405ed09003e6cbe620271e3fb02eb65 (diff) | |
Merge "Battery usage page latency improvement (1-8)" into udc-qpr-dev am: 73efdc9664
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24220783
Change-Id: I9023c5807431b207a16a5154d59fd20f85a75df5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | packages/SettingsLib/src/com/android/settingslib/fuelgauge/BatteryStatus.java | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/packages/SettingsLib/src/com/android/settingslib/fuelgauge/BatteryStatus.java b/packages/SettingsLib/src/com/android/settingslib/fuelgauge/BatteryStatus.java index 9ab84d254ed6..f90a17ae8761 100644 --- a/packages/SettingsLib/src/com/android/settingslib/fuelgauge/BatteryStatus.java +++ b/packages/SettingsLib/src/com/android/settingslib/fuelgauge/BatteryStatus.java @@ -45,6 +45,7 @@ public class BatteryStatus { private static final int EXTREME_LOW_BATTERY_THRESHOLD = 3; private static final int DEFAULT_CHARGING_VOLTAGE_MICRO_VOLT = 5000000; + public static final int BATTERY_LEVEL_UNKNOWN = -1; public static final int CHARGING_UNKNOWN = -1; public static final int CHARGING_SLOWLY = 0; public static final int CHARGING_REGULAR = 1; @@ -186,12 +187,13 @@ public class BatteryStatus { /** Gets the battery level from the intent. */ public static int getBatteryLevel(Intent batteryChangedIntent) { if (batteryChangedIntent == null) { - return -1; /*invalid battery level*/ + return BATTERY_LEVEL_UNKNOWN; } - final int level = batteryChangedIntent.getIntExtra(BatteryManager.EXTRA_LEVEL, -1); + final int level = + batteryChangedIntent.getIntExtra(BatteryManager.EXTRA_LEVEL, BATTERY_LEVEL_UNKNOWN); final int scale = batteryChangedIntent.getIntExtra(BatteryManager.EXTRA_SCALE, 0); return scale == 0 - ? -1 /*invalid battery level*/ + ? BATTERY_LEVEL_UNKNOWN : Math.round((level / (float) scale) * 100f); } |