| commit | bfc0458220748508efd74ccffa28351a9a3d6675 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Fri Sep 22 06:29:11 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 22 06:29:11 2023 +0000 |
| tree | 7781b34d54681d211d42906813e0bbe5690a6176 | |
| parent | 65c34137da821d8ce8ee1d66c0b2e562680460f4 [diff] | |
| parent | 5dd5c4874fd3bfe44dd209fcf6e45f870cd9a271 [diff] |
Merge "Fix JAVA_CRASH NullPointerException in BatteryUsageDataLoader." into udc-qpr-dev am: 7cac3f9f7d am: 5dd5c4874f Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24820838 Change-Id: I2bd72f98041f50e050f1b418e6a63a79910df0fd Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/src/com/android/settings/fuelgauge/batteryusage/BatteryUsageDataLoader.java b/src/com/android/settings/fuelgauge/batteryusage/BatteryUsageDataLoader.java index fd0f866..4a336eb 100644 --- a/src/com/android/settings/fuelgauge/batteryusage/BatteryUsageDataLoader.java +++ b/src/com/android/settings/fuelgauge/batteryusage/BatteryUsageDataLoader.java
@@ -120,7 +120,7 @@ DatabaseUtils.sendBatteryUsageSlotData(context, ConvertUtils.convertToBatteryUsageSlotList(batteryDiffDataMap)); if (batteryDiffDataMap.values().stream().anyMatch(data -> - (!data.getAppDiffEntryList().isEmpty() + data != null && (!data.getAppDiffEntryList().isEmpty() || !data.getSystemDiffEntryList().isEmpty()))) { FeatureFactory.getFeatureFactory().getPowerUsageFeatureProvider() .detectSettingsAnomaly(context, /* displayDrain= */ 0);