Snap for 8917908 from f7942f3c6234246f4684fa5057bb3d462072a78a to mainline-cellbroadcast-release
Change-Id: I101092eb9f670814068b2b3fcbd96b60c5ae3748
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;
