Merge d497c991574b30923c165638a9c40f46617139fd on remote branch
Change-Id: I8927569a086028243d286c2f9623fde6adab70bd
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 @@
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 @@
}
if (builder.scheduledExecutorService == null) {
scheduledExecutorService = Executors.newSingleThreadScheduledExecutor();
+ createdScheduledExecutorService = true;
} else {
scheduledExecutorService = builder.scheduledExecutorService;
+ createdScheduledExecutorService = false;
}
if (builder.binder == null) {
@@ -71,6 +74,13 @@
}
@Override
+ protected void finalize() throws Throwable {
+ if (createdScheduledExecutorService) {
+ scheduledExecutorService.shutdownNow();
+ }
+ }
+
+ @Override
public void startConnecting() {
if (VERSION.SDK_INT < VERSION_CODES.O) {
return;