PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix b/243485315: NullPointerException when getAppBatteryUsageData()." into tm-qpr-dev am: 9c39783771

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19745374

Change-Id: I72232623545b854b4683c2ec1013d7bf5ac858a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
TreeHugger Robot
2022-08-26 04:41:26 +00:00
committed by Automerger Merge Worker
parent b154b58576 9c39783771
commit b9a44a9130
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/com/android/settings/fuelgauge/batteryusage/BatteryChartPreferenceController.java
View File

@@ -697,12 +697,13 @@ public class BatteryChartPreferenceController extends AbstractPreferenceControll
final Map<Integer, Map<Integer, BatteryDiffData>> batteryUsageData = final Map<Integer, Map<Integer, BatteryDiffData>> batteryUsageData =
DataProcessor.getBatteryUsageData(context, batteryHistoryMap); DataProcessor.getBatteryUsageData(context, batteryHistoryMap);
return batteryUsageData == null if (batteryUsageData == null) {
? null return null;
: batteryUsageData }
.get(BatteryChartViewModel.SELECTED_INDEX_ALL) BatteryDiffData allBatteryDiffData = batteryUsageData.get(
.get(BatteryChartViewModel.SELECTED_INDEX_ALL) BatteryChartViewModel.SELECTED_INDEX_ALL).get(
.getAppDiffEntryList(); BatteryChartViewModel.SELECTED_INDEX_ALL);
return allBatteryDiffData == null ? null : allBatteryDiffData.getAppDiffEntryList();
} }
/** Used for {@link AppBatteryPreferenceController}. */ /** Used for {@link AppBatteryPreferenceController}. */