commit 7dce61f0a24e1c56243783feca4278542b09ec67
author Dmitri Plotnikov <dplotnikov@google.com> Wed Aug 16 19:47:23 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Aug 16 19:47:23 2023 +0000
tree 9d2569d54dc11de9a80f90d7a7ac1d8033c087c5
parent 2c00da4e4a83e6a2a9bc6c2096ef329accda3ad9
parent 21431c63b8d65f278ae88a4cdba9248c5f6a6bdf

Merge "Catch RejectedExecutionException in BatteryExternalStatsWorker" into main

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() {