Refactor TelephonyRcsService to contain RcsFeatureManager
Instead of using ImsPhone as the root object to maintain RCS,
this refactor moves these dependencies into TelephonyRcsService
to remove the messy coupling in ImsPhone and TelephonyRcsService.
Test: atest TeleServiceTests
Test: atest CtsTelephonyTestCases
Change-Id: I82c1681b6fcd5ff9efbbbb05dfbfd71aa2d00101
diff --git a/tests/src/com/android/TestContext.java b/tests/src/com/android/TestContext.java
index 776ec6a..c190be9 100644
--- a/tests/src/com/android/TestContext.java
+++ b/tests/src/com/android/TestContext.java
@@ -34,6 +34,8 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
+import java.util.concurrent.Executor;
+
public class TestContext extends MockContext {
@Mock CarrierConfigManager mMockCarrierConfigManager;
@@ -49,6 +51,12 @@
}
@Override
+ public Executor getMainExecutor() {
+ // Just run on current thread
+ return Runnable::run;
+ }
+
+ @Override
public Context getApplicationContext() {
return this;
}