1 files changed, 8 insertions, 1 deletions
diff --git a/java/com/android/voicemail/impl/scheduling/TaskExecutor.java b/java/com/android/voicemail/impl/scheduling/TaskExecutor.java
index 84dc1db4a..e3b718e50 100644
--- a/java/com/android/voicemail/impl/scheduling/TaskExecutor.java
+++ b/java/com/android/voicemail/impl/scheduling/TaskExecutor.java
@@ -193,13 +193,13 @@ final class TaskExecutor {
   /** Should attempt to run the next task when a task has finished or been added. */
   private boolean taskAutoRunDisabledForTesting = false;
 
+  /** Handles execution of the background task in teh worker thread. */
   @VisibleForTesting
   final class WorkerThreadHandler extends Handler {
 
     public WorkerThreadHandler(Looper looper) {
       super(looper);
     }
-
     @Override
     @WorkerThread
     public void handleMessage(Message msg) {
@@ -218,6 +218,7 @@ final class TaskExecutor {
     }
   }
 
+  /** Handles completion of the background task in the main thread. */
   @VisibleForTesting
   final class MainThreadHandler extends Handler {
 
@@ -233,6 +234,11 @@ final class TaskExecutor {
       getTasks().remove(task);
       task.onCompleted();
       isWorkerThreadBusy = false;
+      if (!isJobRunning() || isTerminating()) {
+        // TaskExecutor was terminated when the task is running in background, don't need to run the
+        // next task or terminate again
+        return;
+      }
       maybeRunNextTask();
     }
   }
@@ -290,6 +296,7 @@ final class TaskExecutor {
   @MainThread
   private void maybeRunNextTask() {
     Assert.isMainThread();
+
     if (isWorkerThreadBusy) {
       return;
     }