Snap for 6502793 from ce621d596257b30926d8a16055db48c8f4934ce7 to mainline-release

Change-Id: Idede671c10087e0de0bd062a391f98cb21e8d08e

1 files changed, 6 insertions, 1 deletions

diff --git a/src/java/com/android/ims/ImsManager.java b/src/java/com/android/ims/ImsManager.java
index 48459496..966814fd 100644
--- a/src/java/com/android/ims/ImsManager.java
+++ b/src/java/com/android/ims/ImsManager.java
@@ -210,7 +210,8 @@ public class ImsManager implements IFeatureConnector {
         void executeRunnable(Runnable runnable);
     }
 
-    private static class ImsExecutorFactory implements ExecutorFactory {
+    @VisibleForTesting
+    public static class ImsExecutorFactory implements ExecutorFactory {
 
         private final HandlerThread mThreadHandler;
         private final Handler mHandler;
@@ -225,6 +226,10 @@ public class ImsManager implements IFeatureConnector {
         public void executeRunnable(Runnable runnable) {
             mHandler.post(runnable);
         }
+
+        public void destroy() {
+            mThreadHandler.quit();
+        }
     }
 
     // Replaced with single-threaded executor for testing.