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

Merge "Use empty BatteryDiffData instead of null to avoid NullPointerException" into main

Browse Source
This commit is contained in:
Zaiyue Xue
2023-10-11 01:54:39 +00:00
committed by Android (Google) Code Review
parent 03aa2e444e 834e19b188
commit 7385665d8c
2 changed files with 17 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tests/robotests/src/com/android/settings/fuelgauge/batteryusage/DataProcessorTest.java
View File

@@ -1397,12 +1397,14 @@ public final class DataProcessorTest {
}
@Test
public void generateBatteryDiffData_emptyBatteryEntryList_returnNull() {
assertThat(DataProcessor.generateBatteryDiffData(mContext,
public void generateBatteryDiffData_emptyBatteryEntryList_returnEmptyBatteryDiffData() {
final BatteryDiffData batteryDiffData = DataProcessor.generateBatteryDiffData(mContext,
System.currentTimeMillis(),
DataProcessor.convertToBatteryHistEntry(null, mBatteryUsageStats),
/* systemAppsPackageNames= */ Set.of(),
/* systemAppsUids= */ Set.of())).isNull();
/* systemAppsUids= */ Set.of());
assertThat(batteryDiffData.getAppDiffEntryList()).isEmpty();
assertThat(batteryDiffData.getSystemDiffEntryList()).isEmpty();
}
@Test