Merge "IMS: Changes for MultiEndpoint" into nyc-dev (0e3aff1a) · Commits · e / os / android_frameworks_base

telephony/java/com/android/ims/ImsExternalCallState.java

+20 −13

Original line number	Diff line number	Diff line
		@@ -28,7 +28,7 @@ import android.telephony.Rlog;
		*/

		/**
		* Parcelable object to handle VICE Dialog Information
		* Parcelable object to handle MultiEndpoint Dialog Information
		* @hide
		*/
		public class ImsExternalCallState implements Parcelable {
		@@ -39,19 +39,30 @@ public class ImsExternalCallState implements Parcelable {
		public static final int CALL_STATE_CONFIRMED = 1;
		public static final int CALL_STATE_TERMINATED = 2;
		// Dialog Id
		public int mCallId;
		private int mCallId;
		// Number
		public Uri mAddress;
		public boolean mIsPullable;
		private Uri mAddress;
		private boolean mIsPullable;
		// CALL_STATE_CONFIRMED / CALL_STATE_TERMINATED
		public int mCallState;
		private int mCallState;
		// ImsCallProfile#CALL_TYPE_*
		public int mCallType;
		public boolean mIsHeld;
		private int mCallType;
		private boolean mIsHeld;

		public ImsExternalCallState() {
		}

		public ImsExternalCallState(int callId, Uri address, boolean isPullable, int callState,
		int callType, boolean isCallheld) {
		mCallId = callId;
		mAddress = address;
		mIsPullable = isPullable;
		mCallState = callState;
		mCallType = callType;
		mIsHeld = isCallheld;
		Rlog.d(TAG, "ImsExternalCallState = " + this);
		}

		public ImsExternalCallState(Parcel in) {
		mCallId = in.readInt();
		ClassLoader classLoader = ImsExternalCallState.class.getClassLoader();
		@@ -60,12 +71,7 @@ public class ImsExternalCallState implements Parcelable {
		mCallState = in.readInt();
		mCallType = in.readInt();
		mIsHeld = (in.readInt() != 0);
		Rlog.d(TAG, "ImsExternalCallState const = " +
		"callid = " + getCallId() +
		", address = " + getAddress() +
		", mCallState = " + getCallState() +
		", calltype = " + getCallType() +
		", isheld = " + isCallHeld());
		Rlog.d(TAG, "ImsExternalCallState const = " + this);
		}

		@Override
		@@ -81,6 +87,7 @@ public class ImsExternalCallState implements Parcelable {
		out.writeInt(mCallState);
		out.writeInt(mCallType);
		out.writeInt(mIsHeld ? 1 : 0);
		Rlog.d(TAG, "ImsExternalCallState writeToParcel = " + out.toString());
		}

		public static final Parcelable.Creator<ImsExternalCallState> CREATOR =

telephony/java/com/android/ims/internal/IImsExternalCallStateListener.aidl

+1 −1

Original line number	Diff line number	Diff line
		@@ -32,7 +32,7 @@ interface IImsExternalCallStateListener {
		*
		* @return void.
		*/
		void notifyRefreshExternalCallState(in List<ImsExternalCallState> externalCallDialogs);
		void onImsExternalCallStateUpdate(in List<ImsExternalCallState> externalCallDialogs);

		}

telephony/java/com/android/ims/internal/IImsMultiEndpoint.aidl

+1 −1

Original line number	Diff line number	Diff line
		@@ -34,5 +34,5 @@ interface IImsMultiEndpoint {
		* Query api to get the latest Dialog Event Package information
		* Should be invoked only after setListener is done
		*/
		void requestDialogEventPackageState();
		void requestImsExternalCallStateInfo();
		}

telephony/java/com/android/internal/telephony/TelephonyProperties.java

+0 −7

Original line number	Diff line number	Diff line
		@@ -218,11 +218,4 @@ public interface TelephonyProperties
		*/
		static final String PROPERTY_VIDEOCALL_AUDIO_OUTPUT = "persist.radio.call.audio.output";

		/**
		* For MultiEndpoint Feature
		* If true: Dial intent is for call pull functionality
		* if false: normal dial
		*/
		static final String EXTRA_IS_CALL_PULL =
		"android.telephony.extra.IS_CALL_PULL";
		}