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

Commit 6c7c4a96 authored by Priyanka Advani (xWF)'s avatar Priyanka Advani (xWF) Committed by Android (Google) Code Review
Browse files

Revert "Modify Tests to make SessionManager final for tests" 

Revert submission 30239784-spec_session_fix

Reason for revert: Droidmonitor created revert due to b/377750579. Will be verifying through ABTD before submission.

Reverted changes: /q/submissionid:30239784-spec_session_fix

Change-Id: I1c09cc79093365e4e3b4e3039ca40561c6637a03
parent 4b34bf54

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

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

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.setSessionManager(mComponentContextFixture.getTestDouble().getApplicationContext(),

                null);

        Log.setSessionContext(mComponentContextFixture.getTestDouble().getApplicationContext());

        Log.getSessionManager().mCleanStaleSessions = null;

    }



    public void tearDown() throws Exception {