Merge "Prevent IndexOutOfBoundsException when trimming the battery history directory" into main

1 files changed, 3 insertions, 1 deletions

diff --git a/services/core/java/com/android/server/power/stats/BatteryHistoryDirectory.java b/services/core/java/com/android/server/power/stats/BatteryHistoryDirectory.java
index 7cd9bdbc662c..b4ca7845ffee 100644
--- a/services/core/java/com/android/server/power/stats/BatteryHistoryDirectory.java
+++ b/services/core/java/com/android/server/power/stats/BatteryHistoryDirectory.java
@@ -505,7 +505,9 @@ public class BatteryHistoryDirectory implements BatteryStatsHistory.BatteryHisto
                 for (int i = 0; i < mHistoryFiles.size(); i++) {
                     size += (int) mHistoryFiles.get(i).atomicFile.getBaseFile().length();
                 }
-                while (size > mMaxHistorySize) {
+                // Trim until the directory size is within the limit or there is just one most
+                // recent file left in the directory
+                while (size > mMaxHistorySize && mHistoryFiles.size() > 1) {
                     BatteryHistoryFile oldest = mHistoryFiles.get(0);
                     int length = (int) oldest.atomicFile.getBaseFile().length();
                     oldest.atomicFile.delete();