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

Commit 69e989ac authored by Libin.Tang@motorola.com's avatar Libin.Tang@motorola.com Committed by Pavel Zhamaitsiak
Browse files

IMS:silent redial/srvcc call cleanup. 

When silent redial or srvcc occurs. the IMSPhone call state is not set to idle
even after the call is ended. Also, the mConnection in mHandoverCall is not
cleaned up. This CL is to fix these 2 issues.

Bug:  19035679
Change-Id: I6bee704e2d7d8bf05ca1a910d25af4a02347328b
parent 90d36406

src/java/com/android/internal/telephony/cdma/CdmaCallTracker.java

+5 −0
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ import com.android.internal.telephony.Phone; 
import com.android.internal.telephony.PhoneBase;

import com.android.internal.telephony.PhoneConstants;

import com.android.internal.telephony.TelephonyProperties;

import com.android.internal.telephony.imsphone.ImsPhone;

import com.android.internal.telephony.imsphone.ImsPhoneConnection;



import java.io.FileDescriptor;
@@ -467,6 +468,10 @@ public final class CdmaCallTracker extends CallTracker { 
                !(mForegroundCall.isIdle() && mBackgroundCall.isIdle())) {

            mState = PhoneConstants.State.OFFHOOK;

        } else {

            ImsPhone imsPhone = (ImsPhone)mPhone.getImsPhone();

            if ( mState == PhoneConstants.State.OFFHOOK && (imsPhone != null)){

                imsPhone.callEndCleanupHandOverCallIfAny();

            }

            mState = PhoneConstants.State.IDLE;

        }

src/java/com/android/internal/telephony/gsm/GsmCallTracker.java

+5 −1
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ import com.android.internal.telephony.gsm.CallFailCause; 
import com.android.internal.telephony.gsm.GSMPhone;

import com.android.internal.telephony.gsm.GsmCall;

import com.android.internal.telephony.gsm.GsmConnection;

import com.android.internal.telephony.imsphone.ImsPhone;

import com.android.internal.telephony.imsphone.ImsPhoneConnection;



import java.io.FileDescriptor;
@@ -393,13 +394,16 @@ public final class GsmCallTracker extends CallTracker { 
    private void

    updatePhoneState() {

        PhoneConstants.State oldState = mState;



        if (mRingingCall.isRinging()) {

            mState = PhoneConstants.State.RINGING;

        } else if (mPendingMO != null ||

                !(mForegroundCall.isIdle() && mBackgroundCall.isIdle())) {

            mState = PhoneConstants.State.OFFHOOK;

        } else {

            ImsPhone imsPhone = (ImsPhone)mPhone.getImsPhone();

            if ( mState == PhoneConstants.State.OFFHOOK && (imsPhone != null)){

                imsPhone.callEndCleanupHandOverCallIfAny();

            }

            mState = PhoneConstants.State.IDLE;

        }

src/java/com/android/internal/telephony/imsphone/ImsPhone.java

+5 −0
Original line number Diff line number Diff line
@@ -1249,7 +1249,12 @@ public class ImsPhone extends ImsPhoneBase { 
    public boolean isImsRegistered() {

        return mImsRegistered;

    }



    public void setImsRegistered(boolean value) {

        mImsRegistered = value;

    }



    public void callEndCleanupHandOverCallIfAny() {

        mCT.callEndCleanupHandOverCallIfAny();

    }

}

src/java/com/android/internal/telephony/imsphone/ImsPhoneCallTracker.java

+9 −0
Original line number Diff line number Diff line
@@ -780,6 +780,15 @@ public final class ImsPhoneCallTracker extends CallTracker { 
        mPhone.notifyPreciseCallStateChanged();

    }



    void callEndCleanupHandOverCallIfAny() {

        if (mHandoverCall.mConnections.size() > 0) {

            if (DBG) log("callEndCleanupHandOverCallIfAny, mHandoverCall.mConnections="

                    + mHandoverCall.mConnections);

            mHandoverCall.mConnections.clear();

            mState = PhoneConstants.State.IDLE;

        }

    }



    /* package */

    void resumeWaitingOrHolding() throws CallStateException {

        if (DBG) log("resumeWaitingOrHolding");