Merge "Issue 128385394: UE fails to disconnect Call from User Interface." (edb1a115) · Commits · e / os / android_frameworks_opt_telephony

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

+12 −0

Original line number	Diff line number	Diff line
		@@ -291,6 +291,18 @@ public abstract class CallTracker extends Handler {
		return ret;
		}

		/**
		* Get the ringing connections which during SRVCC handover.
		*/
		public Connection getRingingHandoverConnection() {
		for (Connection hoConn : mHandoverConnections) {
		if (hoConn.getCall().isRinging()) {
		return hoConn;
		}
		}
		return null;
		}

		//***** Overridden from Handler
		@Override
		public abstract void handleMessage (Message msg);

+7 −0

Original line number	Diff line number	Diff line
		@@ -929,6 +929,13 @@ public class GsmCdmaPhone extends Phone {
		if ( imsPhone != null && imsPhone.getRingingCall().isRinging()) {
		return imsPhone.getRingingCall();
		}
		//It returns the ringing connections which during SRVCC handover
		if (!mCT.mRingingCall.isRinging()
		&& mCT.getRingingHandoverConnection() != null
		&& mCT.getRingingHandoverConnection().getCall() != null
		&& mCT.getRingingHandoverConnection().getCall().isRinging()) {
		return mCT.getRingingHandoverConnection().getCall();
		}
		return mCT.mRingingCall;
		}