Modify Tests to make SessionManager final for tests
Flag: com.android.internal.telephony.flags.ims_resolver_user_aware
Bug: 375088362
Test: atest TelecomUnitTests
Change-Id: I6fec2271df8fe9e127a93d3cf478299946a70527
diff --git a/tests/src/com/android/server/telecom/tests/SessionManagerTest.java b/tests/src/com/android/server/telecom/tests/SessionManagerTest.java
index fd33afa..631d522 100644
--- a/tests/src/com/android/server/telecom/tests/SessionManagerTest.java
+++ b/tests/src/com/android/server/telecom/tests/SessionManagerTest.java
@@ -61,13 +61,11 @@
@Before
public void setUp() throws Exception {
super.setUp();
- mTestSessionManager = new SessionManager();
+ mTestSessionManager = new SessionManager(null);
mTestSessionManager.registerSessionListener(((sessionName, timeMs) -> {
mfullSessionCompleteTime = timeMs;
mFullSessionMethodName = sessionName;
}));
- // Remove automatic stale session cleanup for testing
- mTestSessionManager.mCleanStaleSessions = null;
}
@Override
diff --git a/tests/src/com/android/server/telecom/tests/TelecomTestCase.java b/tests/src/com/android/server/telecom/tests/TelecomTestCase.java
index e8389a0..5b5c3ed 100644
--- a/tests/src/com/android/server/telecom/tests/TelecomTestCase.java
+++ b/tests/src/com/android/server/telecom/tests/TelecomTestCase.java
@@ -51,8 +51,8 @@
mComponentContextFixture = new ComponentContextFixture(mFeatureFlags);
mContext = mComponentContextFixture.getTestDouble().getApplicationContext();
- Log.setSessionContext(mComponentContextFixture.getTestDouble().getApplicationContext());
- Log.getSessionManager().mCleanStaleSessions = null;
+ Log.setSessionManager(mComponentContextFixture.getTestDouble().getApplicationContext(),
+ null);
}
public void tearDown() throws Exception {