Merge "Revert "Modify Tests to make SessionManager final for tests"" into main
diff --git a/tests/src/com/android/server/telecom/tests/SessionManagerTest.java b/tests/src/com/android/server/telecom/tests/SessionManagerTest.java
index 631d522..fd33afa 100644
--- a/tests/src/com/android/server/telecom/tests/SessionManagerTest.java
+++ b/tests/src/com/android/server/telecom/tests/SessionManagerTest.java
@@ -61,11 +61,13 @@
@Before
public void setUp() throws Exception {
super.setUp();
- mTestSessionManager = new SessionManager(null);
+ mTestSessionManager = new SessionManager();
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 5b5c3ed..e8389a0 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.setSessionManager(mComponentContextFixture.getTestDouble().getApplicationContext(),
- null);
+ Log.setSessionContext(mComponentContextFixture.getTestDouble().getApplicationContext());
+ Log.getSessionManager().mCleanStaleSessions = null;
}
public void tearDown() throws Exception {