Merge "Propagating isMultiParty indicator from RIL up into Telephony layer." into lmp-mr1-dev (c36fa248) · Commits · e / os / android_frameworks_opt_telephony

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

+7 −6

Original line number	Diff line number	Diff line
		@@ -82,7 +82,12 @@ public class ImsPhoneCall extends Call {
		@Override
		public boolean
		isMultiparty() {
		return mConnections.size() > 1;
		ImsCall imsCall = getImsCall();
		if (imsCall == null) {
		return false;
		}

		return imsCall.isMultiparty();
		}

		/** Please note: if this is the foreground call and a
		@@ -274,11 +279,7 @@ public class ImsPhoneCall extends Call {

		/* package */ ImsPhoneConnection
		getHandoverConnection() {
		ImsPhoneConnection conn = (ImsPhoneConnection) getEarliestConnection();
		if (conn != null) {
		conn.setMultiparty(isMultiparty());
		}
		return conn;
		return (ImsPhoneConnection) getEarliestConnection();
		}

		void switchWith(ImsPhoneCall that) {

+2 −10

Original line number	Diff line number	Diff line
		@@ -71,9 +71,6 @@ public class ImsPhoneConnection extends Connection {
		private int mCause = DisconnectCause.NOT_DISCONNECTED;
		private PostDialState mPostDialState = PostDialState.NOT_STARTED;
		private UUSInfo mUusInfo;

		private boolean mIsMultiparty = false;

		private Handler mHandler;

		private PowerManager.WakeLock mPartialWakeLock;
		@@ -569,15 +566,10 @@ public class ImsPhoneConnection extends Connection {
		return null;
		}

		/* package */ void
		setMultiparty(boolean isMultiparty) {
		Rlog.d(LOG_TAG, "setMultiparty " + isMultiparty);
		mIsMultiparty = isMultiparty;
		}

		@Override
		public boolean isMultiparty() {
		return mIsMultiparty;
		Rlog.d(LOG_TAG, "isMultiparty "+mImsCall.isMultiparty());
		return mImsCall.isMultiparty();
		}

		/package/ ImsCall getImsCall() {