Clean up BatteryAppListPreferenceController

Bug: 256123455
Bug: 258576047
Fix: 258576047
Test: presubmit
Change-Id: I8c3d05f76e7a6995fccc34b2cc60ee126bb3d350
This commit is contained in:
Zaiyue Xue
2022-11-10 16:58:10 +08:00
parent df25b72044
commit 7a30768503
11 changed files with 179 additions and 905 deletions

View File

@@ -24,13 +24,15 @@ import android.util.Log;
import androidx.annotation.VisibleForTesting;
import java.util.List;
import java.util.function.Supplier;
/** Load battery usage data in the background. */
public final class BatteryUsageDataLoader {
private static final String TAG = "BatteryUsageDataLoader";
// For testing only.
@VisibleForTesting
static BatteryAppListPreferenceController sController;
static Supplier<List<BatteryEntry>> sFakeBatteryEntryListSupplier;
private BatteryUsageDataLoader() {
}
@@ -47,10 +49,9 @@ public final class BatteryUsageDataLoader {
final long start = System.currentTimeMillis();
final BatteryUsageStats batteryUsageStats = DataProcessor.getBatteryUsageStats(context);
final List<BatteryEntry> batteryEntryList =
DataProcessor.generateBatteryEntryListFromBatteryUsageStats(
context,
batteryUsageStats,
sController);
sFakeBatteryEntryListSupplier != null ? sFakeBatteryEntryListSupplier.get()
: DataProcessor.generateBatteryEntryListFromBatteryUsageStats(context,
batteryUsageStats);
if (batteryEntryList == null || batteryEntryList.isEmpty()) {
Log.w(TAG, "getBatteryEntryList() returns null or empty content");
}