diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-08-04 08:36:18 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-08-04 08:36:18 +0000 |
commit | 66088b29fa60dce57a069cbeb25106fe6d991594 (patch) | |
tree | 2975fb45a04a58be9ca65a145992db390d8d55cc | |
parent | 521565e926835fe763bbd660d133fc91cf88d432 (diff) | |
parent | f7942f3c6234246f4684fa5057bb3d462072a78a (diff) | |
download | connectedappssdk-android13-mainline-resolv-release.tar.gz |
Snap for 8905985 from f7942f3c6234246f4684fa5057bb3d462072a78a to mainline-resolv-releaseaml_res_331820000aml_res_331611010aml_res_331512000aml_res_331314010aml_res_331114000aml_res_331011050android13-mainline-resolv-release
Change-Id: I25529ce477c9a75346f446360ae8f03d14200f7e
-rw-r--r-- | sdk/src/main/java/com/google/android/enterprise/connectedapps/AbstractProfileConnector.java | 10 |
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; |