From 320c4c6f552bb99f9bee920629274a5743f9ed3b Mon Sep 17 00:00:00 2001 From: mxyyiyi Date: Thu, 30 May 2024 16:20:13 +0800 Subject: [PATCH] Dump app optimization mode expiration event data in bug report. Bug: 338965652 Test: atest + manual Change-Id: Id506fce6c3bc1271be2677216fc4b1cfe6ada6d0 --- .../batteryusage/bugreport/BugReportContentProvider.java | 1 + .../fuelgauge/batteryusage/bugreport/LogUtils.java | 9 +++++++++ 2 files changed, 10 insertions(+) diff --git a/src/com/android/settings/fuelgauge/batteryusage/bugreport/BugReportContentProvider.java b/src/com/android/settings/fuelgauge/batteryusage/bugreport/BugReportContentProvider.java index ff953e77f86..7613d9ab097 100644 --- a/src/com/android/settings/fuelgauge/batteryusage/bugreport/BugReportContentProvider.java +++ b/src/com/android/settings/fuelgauge/batteryusage/bugreport/BugReportContentProvider.java @@ -54,6 +54,7 @@ public final class BugReportContentProvider extends ContentProvider { return; } writer.println("dump BatteryUsage and AppUsage states:"); + LogUtils.dumpAppOptimizationModeEventHist(context, writer); LogUtils.dumpBatteryUsageDatabaseHist(context, writer); LogUtils.dumpAppUsageDatabaseHist(context, writer); LogUtils.dumpBatteryUsageSlotDatabaseHist(context, writer); diff --git a/src/com/android/settings/fuelgauge/batteryusage/bugreport/LogUtils.java b/src/com/android/settings/fuelgauge/batteryusage/bugreport/LogUtils.java index 88bd4adf463..b2300308fd4 100644 --- a/src/com/android/settings/fuelgauge/batteryusage/bugreport/LogUtils.java +++ b/src/com/android/settings/fuelgauge/batteryusage/bugreport/LogUtils.java @@ -20,6 +20,8 @@ import android.content.Context; import android.util.Log; import com.android.settings.fuelgauge.BatteryUtils; +import com.android.settings.fuelgauge.batteryusage.AppOptModeSharedPreferencesUtils; +import com.android.settings.fuelgauge.batteryusage.AppOptimizationModeEvent; import com.android.settings.fuelgauge.batteryusage.BatteryUsageSlot; import com.android.settings.fuelgauge.batteryusage.ConvertUtils; import com.android.settings.fuelgauge.batteryusage.DatabaseUtils; @@ -47,6 +49,13 @@ public final class LogUtils { private static final Duration DUMP_TIME_OFFSET = Duration.ofHours(24); private static final Duration DUMP_TIME_OFFSET_FOR_ENTRY = Duration.ofHours(4); + static void dumpAppOptimizationModeEventHist(Context context, PrintWriter writer) { + writer.println("\n\tApp Optimization Mode Event History:"); + final List events = + AppOptModeSharedPreferencesUtils.getAllEvents(context); + dumpListItems(writer, events, event -> event); + } + static void dumpBatteryUsageDatabaseHist(Context context, PrintWriter writer) { // Dumps periodic job events. writer.println("\nBattery PeriodicJob History:");