aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHall Liu <hallliu@google.com>2020-05-13 18:33:30 -0700
committerHall Liu <hallliu@google.com>2020-05-14 01:43:16 +0000
commitfecc78e4c6eb032bb50673075d53a9bfbffe236e (patch)
tree39eaa7b677229c7481ca70e284496eef88d3b16e
parent2a4164bf8b8cf0ba6914ae95fa3acf0ac9799116 (diff)
downloadims-fecc78e4c6eb032bb50673075d53a9bfbffe236e.tar.gz
Fix thread leak in ImsManagerTest
Add methods to stop the default executor's HandlerThread during testing Bug: 156287358 Test: atest FrameworksTelephonyTests Change-Id: Iea3553c9564a45b85596aacd5012e26b712a832d
-rw-r--r--src/java/com/android/ims/ImsManager.java7
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.