commit 21431c63b8d65f278ae88a4cdba9248c5f6a6bdf
author Dmitri Plotnikov <dplotnikov@google.com> Tue Aug 15 16:28:59 2023 -0700
committer Dmitri Plotnikov <dplotnikov@google.com> Wed Aug 16 17:37:48 2023 +0000
tree f9092103abbb8417f9942febcb74f402241e51d4
parent 89313266697fc5fab5b470dfb18245930629beb2

Catch RejectedExecutionException in BatteryExternalStatsWorker

Bug: 293566053
Test: monitor crash cluster 2768503370795408875
Change-Id: Ib978947329f10765367d64f5ab2b6b583be8e388

services/core/java/com/android/server/power/stats/BatteryExternalStatsWorker.java

diff --git a/services/core/java/com/android/server/power/stats/BatteryExternalStatsWorker.java b/services/core/java/com/android/server/power/stats/BatteryExternalStatsWorker.java
index d5fd017..f4b2f52 100644
--- a/services/core/java/com/android/server/power/stats/BatteryExternalStatsWorker.java
+++ b/services/core/java/com/android/server/power/stats/BatteryExternalStatsWorker.java
@@ -386,7 +386,11 @@
             }
         }
 
-        return mExecutorService.schedule(syncRunnable, delayMillis, TimeUnit.MILLISECONDS);
+        try {
+            return mExecutorService.schedule(syncRunnable, delayMillis, TimeUnit.MILLISECONDS);
+        } catch (RejectedExecutionException e) {
+            return CompletableFuture.failedFuture(e);
+        }
     }
 
     public synchronized Future<?> scheduleWrite() {