Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3399e3c0 authored by Brad Ebinger's avatar Brad Ebinger Committed by Android (Google) Code Review
Browse files

Merge "Revert^2 "Modify Tests to make SessionManager final for tests"" into main

parents 3d33e1c8 1fb02111

tests/src/com/android/server/telecom/tests/SessionManagerTest.java

+1 −3
Original line number Diff line number Diff line
@@ -61,13 +61,11 @@ public class SessionManagerTest extends TelecomTestCase { 
    @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

tests/src/com/android/server/telecom/tests/TelecomTestCase.java

+2 −2
Original line number Diff line number Diff line
@@ -51,8 +51,8 @@ public abstract class TelecomTestCase { 


        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 {