Snap for 8872536 from 6e460ebb6e92eaec7629828bc02298158bc1c6ad to tm-d1-releaseandroid-13.0.0_r9android-13.0.0_r15android-13.0.0_r14android-13.0.0_r13android-13.0.0_r11android-13.0.0_r10android13-d1-s3-releaseandroid13-d1-s2-releaseandroid13-d1-s1-releaseandroid13-d1-release

Change-Id: I35a5dc706cf46952d4d62b908bb152dea74d3a8a

1 files changed, 10 insertions, 0 deletions

diff --git a/sdk/src/main/java/com/google/android/enterprise/connectedapps/AbstractProfileConnector.java b/sdk/src/main/java/com/google/android/enterprise/connectedapps/AbstractProfileConnector.java
index cc71c7b..dd84c7d 100644
--- a/sdk/src/main/java/com/google/android/enterprise/connectedapps/AbstractProfileConnector.java
+++ b/sdk/src/main/java/com/google/android/enterprise/connectedapps/AbstractProfileConnector.java
@@ -38,6 +38,7 @@ public abstract class AbstractProfileConnector
 
   private final Context context;
   private final ScheduledExecutorService scheduledExecutorService;
+  private final boolean createdScheduledExecutorService;
   private final ConnectionBinder binder;
   private final String serviceClassName;
   private final @Nullable ProfileType primaryProfileType;
@@ -50,8 +51,10 @@ public abstract class AbstractProfileConnector
     }
     if (builder.scheduledExecutorService == null) {
       scheduledExecutorService = Executors.newSingleThreadScheduledExecutor();
+      createdScheduledExecutorService = true;
     } else {
       scheduledExecutorService = builder.scheduledExecutorService;
+      createdScheduledExecutorService = false;
     }
 
     if (builder.binder == null) {
@@ -71,6 +74,13 @@ public abstract class AbstractProfileConnector
   }
 
   @Override
+  protected void finalize() throws Throwable {
+    if (createdScheduledExecutorService) {
+      scheduledExecutorService.shutdownNow();
+    }
+  }
+
+  @Override
   public void startConnecting() {
     if (VERSION.SDK_INT < VERSION_CODES.O) {
       return;