Use the field isFullChargeCycleStart in database to get the last full

charge cycle start and remove the unused SharedPreference.

Test: make RunSettingsRoboTests + manual
Bug: 253553141
Change-Id: I74ef71775fa5d4871077f6d5573467aa5843bc6b
This commit is contained in:
Kuan Wang
2022-11-17 21:33:40 +08:00
parent bf26483af5
commit 2b93d40683
14 changed files with 159 additions and 255 deletions

View File

@@ -37,15 +37,15 @@ public final class BatteryUsageDataLoader {
private BatteryUsageDataLoader() {
}
static void enqueueWork(Context context) {
static void enqueueWork(final Context context, final boolean isFullChargeStart) {
AsyncTask.execute(() -> {
Log.d(TAG, "loadUsageDataSafely() in the AsyncTask");
loadUsageDataSafely(context.getApplicationContext());
loadUsageDataSafely(context.getApplicationContext(), isFullChargeStart);
});
}
@VisibleForTesting
static void loadUsageData(Context context) {
static void loadUsageData(final Context context, final boolean isFullChargeStart) {
final long start = System.currentTimeMillis();
final BatteryUsageStats batteryUsageStats = DataProcessor.getBatteryUsageStats(context);
final List<BatteryEntry> batteryEntryList =
@@ -60,13 +60,14 @@ public final class BatteryUsageDataLoader {
// Uploads the BatteryEntry data into SettingsIntelligence.
DatabaseUtils.sendBatteryEntryData(
context, batteryEntryList, batteryUsageStats);
context, batteryEntryList, batteryUsageStats, isFullChargeStart);
DataProcessor.closeBatteryUsageStats(batteryUsageStats);
}
private static void loadUsageDataSafely(Context context) {
private static void loadUsageDataSafely(
final Context context, final boolean isFullChargeStart) {
try {
loadUsageData(context);
loadUsageData(context, isFullChargeStart);
} catch (RuntimeException e) {
Log.e(TAG, "loadUsageData:" + e);
}