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<AppOptimizationModeEvent> 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:");