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

Commit 9ed723c2 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Clean up calls in GsmCdmaCallTracker on GSM<->CDMA transitions." into nyc-mr1-dev

parents 91c714c0 8dd4a191

src/java/com/android/internal/telephony/GsmCdmaCallTracker.java

+4 −0
Original line number Diff line number Diff line
@@ -189,6 +189,10 @@ public class GsmCdmaCallTracker extends CallTracker { 
                gsmCdmaConnection.dispose();

            }

        }



        mConnections = null;

        mPendingMO = null;

        mState = PhoneConstants.State.IDLE;

    }



    @Override

src/java/com/android/internal/telephony/GsmCdmaConnection.java

+3 −0
Original line number Diff line number Diff line
@@ -215,6 +215,9 @@ public class GsmCdmaConnection extends Connection { 


    public void dispose() {

        clearPostDialListeners();

        if (mParent != null) {

            mParent.detach(this);

        }

        releaseAllWakeLocks();

    }

tests/telephonytests/src/com/android/internal/telephony/GsmCdmaCallTrackerTest.java

+12 −0
Original line number Diff line number Diff line
@@ -358,6 +358,18 @@ public class GsmCdmaCallTrackerTest extends TelephonyTest { 


        // verify getCurrentCalls is called on updating phone type

        verify(mSimulatedCommandsVerifier, times(2)).getCurrentCalls(any(Message.class));



        // verify that if phone type is updated, calls and callTracker go to idle

        testMOCallPickUp();



        // update phone type

        mCTUT.updatePhoneType();



        // verify CT and calls go to idle

        assertEquals(PhoneConstants.State.IDLE, mCTUT.getState());

        assertEquals(GsmCdmaCall.State.IDLE, mCTUT.mForegroundCall.getState());

        assertEquals(GsmCdmaCall.State.IDLE, mCTUT.mBackgroundCall.getState());

        assertEquals(GsmCdmaCall.State.IDLE, mCTUT.mRingingCall.getState());

    }

}