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

Browse Source
This commit is contained in:
TreeHugger Robot
2022-08-26 04:19:51 +00:00
committed by Android (Google) Code Review
parent 37dfb4c46d 87db35205a
commit 9c39783771
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 =
DataProcessor.getBatteryUsageData(context, batteryHistoryMap);
return batteryUsageData == null
? null
: batteryUsageData
.get(BatteryChartViewModel.SELECTED_INDEX_ALL)
.get(BatteryChartViewModel.SELECTED_INDEX_ALL)
.getAppDiffEntryList();
if (batteryUsageData == null) {
return null;
}
BatteryDiffData allBatteryDiffData = batteryUsageData.get(
BatteryChartViewModel.SELECTED_INDEX_ALL).get(
BatteryChartViewModel.SELECTED_INDEX_ALL);
return allBatteryDiffData == null ? null : allBatteryDiffData.getAppDiffEntryList();
}
/** Used for {@link AppBatteryPreferenceController}. */