From cf0b2b662757b70332026def7f7f7c57059d2094 Mon Sep 17 00:00:00 2001 From: Adam Lesinski Date: Tue, 29 Aug 2017 19:30:31 -0700 Subject: BatteryStats: Don't schedule work when shutting down Prevent more work from being queued when BatteryStats is shutting down. Bug: 64901294 Test: manual Change-Id: Ifc74a4405b40c949e440d6d65fdd13ec40920429 --- .../com/android/server/am/BatteryExternalStatsWorker.java | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/services/core/java/com/android/server/am/BatteryExternalStatsWorker.java b/services/core/java/com/android/server/am/BatteryExternalStatsWorker.java index eb84adc8acd9..118484b093b0 100644 --- a/services/core/java/com/android/server/am/BatteryExternalStatsWorker.java +++ b/services/core/java/com/android/server/am/BatteryExternalStatsWorker.java @@ -38,6 +38,7 @@ import com.android.internal.os.BatteryStatsImpl; import libcore.util.EmptyArray; +import java.util.concurrent.CompletableFuture; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.Future; @@ -116,6 +117,10 @@ class BatteryExternalStatsWorker implements BatteryStatsImpl.ExternalStatsSync { } public synchronized Future scheduleWrite() { + if (mExecutorService.isShutdown()) { + return CompletableFuture.failedFuture(new IllegalStateException("worker shutdown")); + } + scheduleSyncLocked("write", UPDATE_ALL); // Since we use a single threaded executor, we can assume the next scheduled task's // Future finishes after the sync. @@ -127,7 +132,9 @@ class BatteryExternalStatsWorker implements BatteryStatsImpl.ExternalStatsSync { * within the task, never wait on the resulting Future. This will result in a deadlock. */ public synchronized void scheduleRunnable(Runnable runnable) { - mExecutorService.submit(runnable); + if (!mExecutorService.isShutdown()) { + mExecutorService.submit(runnable); + } } public void shutdown() { @@ -135,6 +142,10 @@ class BatteryExternalStatsWorker implements BatteryStatsImpl.ExternalStatsSync { } private Future scheduleSyncLocked(String reason, int flags) { + if (mExecutorService.isShutdown()) { + return CompletableFuture.failedFuture(new IllegalStateException("worker shutdown")); + } + if (mCurrentFuture == null) { mUpdateFlags = flags; mCurrentReason = reason; -- cgit v1.2.3-59-g8ed1b