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

Merge "Update battery usage data clear mechanism while time change." into main

Browse Source
This commit is contained in:
Xinyi Mao
2023-11-03 08:15:04 +00:00
committed by Android (Google) Code Review
parent 0e9682eb31 ad23b53942
commit 17860b3e44
4 changed files with 36 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
protos/fuelgauge_log.proto
View File

@@ -43,6 +43,7 @@ message BatteryUsageHistoricalLogEntry {
RECHECK_JOB = 3;
FETCH_USAGE_DATA = 4;
INSERT_USAGE_DATA = 5;
TIME_UPDATED = 6;
}
optional int64 timestamp = 1;

3
src/com/android/settings/fuelgauge/batteryusage/BootBroadcastReceiver.java
View File

@@ -70,8 +70,7 @@ public final class BootBroadcastReceiver extends BroadcastReceiver {
break;
case Intent.ACTION_TIME_CHANGED:
Log.d(TAG, "refresh job and clear all data from action=" + action);
DatabaseUtils.clearAll(context);
PeriodicJobManager.getInstance(context).refreshJob(/*fromBoot=*/ false);
DatabaseUtils.clearDataAfterTimeChangedIfNeeded(context);
break;
default:
Log.w(TAG, "receive unsupported action=" + action);

4
src/com/android/settings/fuelgauge/batteryusage/DataProcessManager.java
View File

@@ -72,8 +72,6 @@ public class DataProcessManager {
private static final String TAG = "DataProcessManager";
private static final List<BatteryEventType> POWER_CONNECTION_EVENTS =
List.of(BatteryEventType.POWER_CONNECTED, BatteryEventType.POWER_DISCONNECTED);
private static final List<BatteryEventType> BATTERY_LEVEL_RECORD_EVENTS =
List.of(BatteryEventType.FULL_CHARGED, BatteryEventType.EVEN_HOUR);
// For testing only.
@VisibleForTesting
@@ -575,7 +573,7 @@ public class DataProcessManager {
final List<BatteryEvent> batteryLevelRecordEvents =
DatabaseUtils.getBatteryEvents(
context, Calendar.getInstance(), lastFullChargeTime,
BATTERY_LEVEL_RECORD_EVENTS);
DatabaseUtils.BATTERY_LEVEL_RECORD_EVENTS);
final long startTimestamp = batteryLevelRecordEvents.isEmpty()
? lastFullChargeTime : batteryLevelRecordEvents.get(0).getTimestamp();
final BatteryLevelData batteryLevelData = getPeriodBatteryLevelData(context, handler,

33
src/com/android/settings/fuelgauge/batteryusage/DatabaseUtils.java
View File

@@ -53,6 +53,7 @@ import java.time.Duration;
import java.util.ArrayList;
import java.util.Calendar;
import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.Set;
import java.util.function.Function;
@@ -133,6 +134,9 @@ public final class DatabaseUtils {
.authority(AUTHORITY)
.appendPath(BATTERY_USAGE_SLOT_TABLE)
.build();
/** A list of level record event types to access battery usage data. */
public static final List<BatteryEventType> BATTERY_LEVEL_RECORD_EVENTS =
List.of(BatteryEventType.FULL_CHARGED, BatteryEventType.EVEN_HOUR);
// For testing only.
@VisibleForTesting
@@ -408,6 +412,35 @@ public final class DatabaseUtils {
});
}
/** Clears all data and jobs if current timestamp is out of the range of last recorded job. */
public static void clearDataAfterTimeChangedIfNeeded(Context context) {
AsyncTask.execute(() -> {
try {
final List<BatteryEvent> batteryLevelRecordEvents =
DatabaseUtils.getBatteryEvents(context, Calendar.getInstance(),
getLastFullChargeTime(context), BATTERY_LEVEL_RECORD_EVENTS);
final long lastRecordTimestamp = batteryLevelRecordEvents.isEmpty()
? INVALID_TIMESTAMP : batteryLevelRecordEvents.get(0).getTimestamp();
final long nextRecordTimestamp =
TimestampUtils.getNextEvenHourTimestamp(lastRecordTimestamp);
final long currentTime = System.currentTimeMillis();
final boolean isOutOfTimeRange = lastRecordTimestamp == INVALID_TIMESTAMP
|| currentTime < lastRecordTimestamp || currentTime > nextRecordTimestamp;
final String logInfo = String.format(Locale.ENGLISH,
"clear database = %b, current time = %d, last record time = %d",
isOutOfTimeRange, currentTime, lastRecordTimestamp);
Log.d(TAG, logInfo);
BatteryUsageLogUtils.writeLog(context, Action.TIME_UPDATED, logInfo);
if (isOutOfTimeRange) {
DatabaseUtils.clearAll(context);
PeriodicJobManager.getInstance(context).refreshJob(/* fromBoot= */ false);
}
} catch (RuntimeException e) {
Log.e(TAG, "refreshDataAndJobIfNeededAfterTimeChanged() failed", e);
}
});
}
/** Returns the timestamp for 00:00 6 days before the calendar date. */
public static long getTimestampSixDaysAgo(Calendar calendar) {
Calendar startCalendar =