Snap for 8992082 from 854c0bfc44e1ad2bb306bc30eb556551e913c43d to gki13-boot-releasegki13-boot-release

Change-Id: I9314ecd68ad9c482cd10a91caa2300941cc6c13b

2 files changed, 12 insertions, 2 deletions

diff --git a/processor/src/main/java/com/google/android/enterprise/connectedapps/processor/DispatcherGenerator.java b/processor/src/main/java/com/google/android/enterprise/connectedapps/processor/DispatcherGenerator.java
index a4f8ef6..f8733d1 100644
--- a/processor/src/main/java/com/google/android/enterprise/connectedapps/processor/DispatcherGenerator.java
+++ b/processor/src/main/java/com/google/android/enterprise/connectedapps/processor/DispatcherGenerator.java
@@ -184,7 +184,7 @@ final class DispatcherGenerator {
         ArrayTypeName.of(byte.class));
     methodCode.addStatement("throwableParcel.recycle()");
 
-    methodCode.addStatement("$T.throwInBackground(e)", BACKGROUND_EXCEPTION_THROWER_CLASSNAME);
+    // methodCode.addStatement("$T.throwInBackground(e)", BACKGROUND_EXCEPTION_THROWER_CLASSNAME);
 
     methodCode.addStatement("return throwableBytes");
     methodCode.nextControlFlow("catch ($T e)", Error.class);
@@ -199,7 +199,7 @@ final class DispatcherGenerator {
             ArrayTypeName.of(byte.class));
     methodCode.addStatement("throwableParcel.recycle()");
 
-    methodCode.addStatement("$T.throwInBackground(e)", BACKGROUND_EXCEPTION_THROWER_CLASSNAME);
+    // methodCode.addStatement("$T.throwInBackground(e)", BACKGROUND_EXCEPTION_THROWER_CLASSNAME);
 
     methodCode.addStatement("return throwableBytes");
     methodCode.endControlFlow();
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;