Merge "IMS: Add support for ims phantom dialing call." (01620e23) · Commits · e / os / android_frameworks_opt_telephony

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

+6 −0

Original line number	Diff line number	Diff line
		@@ -1775,6 +1775,12 @@ public abstract class PhoneBase extends Handler implements Phone {
		mNewRingingConnectionRegistrants.notifyRegistrants(ar);
		}

		/**
		* Notify registrants of a new unknown connection.
		*/
		public void notifyUnknownConnectionP(Connection cn) {
		mUnknownConnectionRegistrants.notifyResult(cn);
		}

		/**
		* Notify registrants if phone is video capable.

+1 −1

Original line number	Diff line number	Diff line
		@@ -1153,7 +1153,7 @@ public class CDMAPhone extends PhoneBase {
		}

		void notifyUnknownConnection(Connection connection) {
		mUnknownConnectionRegistrants.notifyResult(connection);
		super.notifyUnknownConnectionP(connection);
		}

		@Override

+1 −1

Original line number	Diff line number	Diff line
		@@ -492,7 +492,7 @@ public class GSMPhone extends PhoneBase {
		}

		void notifyUnknownConnection(Connection cn) {
		mUnknownConnectionRegistrants.notifyResult(cn);
		super.notifyUnknownConnectionP(cn);
		}

		void notifySuppServiceFailed(SuppService code) {

+4 −0

Original line number	Diff line number	Diff line
		@@ -488,6 +488,10 @@ public class ImsPhone extends ImsPhoneBase {
		mDefaultPhone.notifyNewRingingConnectionP(c);
		}

		void notifyUnknownConnection(Connection c) {
		mDefaultPhone.notifyUnknownConnectionP(c);
		}

		public void notifyForVideoCapabilityChanged(boolean isVideoCapable) {
		mIsVideoCapable = isVideoCapable;
		mDefaultPhone.notifyForVideoCapabilityChanged(isVideoCapable);

+21 −8

Original line number	Diff line number	Diff line
		@@ -104,14 +104,26 @@ public final class ImsPhoneCallTracker extends CallTracker {
		return;
		}

		// Normal MT call
		boolean isUnknown = intent.getBooleanExtra(ImsManager.EXTRA_IS_UNKNOWN_CALL,
		false);
		if (DBG) {
		log("onReceive : isUnknown = " + isUnknown +
		" fg = " + mForegroundCall.getState() +
		" bg = " + mBackgroundCall.getState());
		}

		// Normal MT/Unknown call
		ImsCall imsCall = mImsManager.takeCall(mServiceId, intent, mImsCallListener);
		ImsPhoneConnection conn = new ImsPhoneConnection(mPhone.getContext(), imsCall,
		ImsPhoneCallTracker.this, mRingingCall);
		ImsPhoneCallTracker.this,
		(isUnknown? mForegroundCall: mRingingCall), isUnknown);
		addConnection(conn);

		setVideoCallProvider(conn, imsCall);

		if (isUnknown) {
		mPhone.notifyUnknownConnection(conn);
		} else {
		if ((mForegroundCall.getState() != ImsPhoneCall.State.IDLE) \|\|
		(mBackgroundCall.getState() != ImsPhoneCall.State.IDLE)) {
		conn.update(imsCall, ImsPhoneCall.State.WAITING);
		@@ -119,6 +131,7 @@ public final class ImsPhoneCallTracker extends CallTracker {

		mPhone.notifyNewRingingConnection(conn);
		mPhone.notifyIncomingRing();
		}

		updatePhoneState();
		mPhone.notifyPreciseCallStateChanged();