Snap for 8872621 from c08c376ed90fdb98c2ec1edd501396c5dd8d7f6a to tm-d3-releaseandroid-13.0.0_r57android13-d3-s1-release

Change-Id: Ib69c59eb2e2e72f9add04bae51a8ced51f09e36e

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;