Rename InCallCall to ParcelableCall (1/2) (88b771d8) · Commits · e / os / android_frameworks_base

api/current.txt

+0 −22

Original line number	Diff line number	Diff line
		@@ -28548,28 +28548,6 @@ package android.telecomm {
		method public void unholdCall(java.lang.String);
		}

		public final class InCallCall implements android.os.Parcelable {
		method public int describeContents();
		method public android.telecomm.PhoneAccountHandle getAccountHandle();
		method public android.telecomm.RemoteCallVideoProvider getCallVideoProvider() throws android.os.RemoteException;
		method public java.lang.String getCallerDisplayName();
		method public int getCallerDisplayNamePresentation();
		method public java.util.List<java.lang.String> getCannedSmsResponses();
		method public int getCapabilities();
		method public long getConnectTimeMillis();
		method public int getDisconnectCauseCode();
		method public java.lang.String getDisconnectCauseMsg();
		method public android.telecomm.GatewayInfo getGatewayInfo();
		method public android.net.Uri getHandle();
		method public int getHandlePresentation();
		method public java.lang.String getId();
		method public android.telecomm.CallState getState();
		method public android.telecomm.StatusHints getStatusHints();
		method public int getVideoState();
		method public void writeToParcel(android.os.Parcel, int);
		field public static final android.os.Parcelable.Creator CREATOR;
		}

		public abstract class InCallService extends android.app.Service {
		ctor public InCallService();
		method public android.telecomm.Phone getPhone();

telecomm/java/android/telecomm/Call.java

+28 −27

Original line number	Diff line number	Diff line
		@@ -581,58 +581,59 @@ public final class Call {
		}

		/** {@hide} */
		final void internalUpdate(InCallCall inCallCall) {
		final void internalUpdate(ParcelableCall parcelableCall) {
		// First, we update the internal state as far as possible before firing any updates.

		Details details = new Details(
		inCallCall.getHandle(),
		inCallCall.getHandlePresentation(),
		inCallCall.getCallerDisplayName(),
		inCallCall.getCallerDisplayNamePresentation(),
		inCallCall.getAccountHandle(),
		inCallCall.getCapabilities(),
		inCallCall.getDisconnectCauseCode(),
		inCallCall.getDisconnectCauseMsg(),
		inCallCall.getConnectTimeMillis(),
		inCallCall.getGatewayInfo(),
		inCallCall.getVideoState(),
		inCallCall.getStatusHints());
		parcelableCall.getHandle(),
		parcelableCall.getHandlePresentation(),
		parcelableCall.getCallerDisplayName(),
		parcelableCall.getCallerDisplayNamePresentation(),
		parcelableCall.getAccountHandle(),
		parcelableCall.getCapabilities(),
		parcelableCall.getDisconnectCauseCode(),
		parcelableCall.getDisconnectCauseMsg(),
		parcelableCall.getConnectTimeMillis(),
		parcelableCall.getGatewayInfo(),
		parcelableCall.getVideoState(),
		parcelableCall.getStatusHints());
		boolean detailsChanged = !Objects.equals(mDetails, details);
		if (detailsChanged) {
		mDetails = details;
		}

		boolean cannedTextResponsesChanged = false;
		if (mCannedTextResponses == null && inCallCall.getCannedSmsResponses() != null
		&& !inCallCall.getCannedSmsResponses().isEmpty()) {
		mCannedTextResponses = Collections.unmodifiableList(inCallCall.getCannedSmsResponses());
		if (mCannedTextResponses == null && parcelableCall.getCannedSmsResponses() != null
		&& !parcelableCall.getCannedSmsResponses().isEmpty()) {
		mCannedTextResponses =
		Collections.unmodifiableList(parcelableCall.getCannedSmsResponses());
		}

		boolean callVideoProviderChanged = false;
		try {
		callVideoProviderChanged =
		!Objects.equals(mCallVideoProvider, inCallCall.getCallVideoProvider());
		!Objects.equals(mCallVideoProvider, parcelableCall.getCallVideoProvider());
		if (callVideoProviderChanged) {
		mCallVideoProvider = inCallCall.getCallVideoProvider();
		mCallVideoProvider = parcelableCall.getCallVideoProvider();
		}
		} catch (RemoteException e) {
		}

		int state = stateFromInCallCallState(inCallCall.getState());
		int state = stateFromParcelableCallState(parcelableCall.getState());
		boolean stateChanged = mState != state;
		if (stateChanged) {
		mState = state;
		}

		if (inCallCall.getParentCallId() != null) {
		mParent = mPhone.internalGetCallByTelecommId(inCallCall.getParentCallId());
		if (parcelableCall.getParentCallId() != null) {
		mParent = mPhone.internalGetCallByTelecommId(parcelableCall.getParentCallId());
		}

		mChildren.clear();
		if (inCallCall.getChildCallIds() != null) {
		for (int i = 0; i < inCallCall.getChildCallIds().size(); i++) {
		if (parcelableCall.getChildCallIds() != null) {
		for (int i = 0; i < parcelableCall.getChildCallIds().size(); i++) {
		mChildren.add(mPhone.internalGetCallByTelecommId(
		inCallCall.getChildCallIds().get(i)));
		parcelableCall.getChildCallIds().get(i)));
		}
		}

		@@ -749,8 +750,8 @@ public final class Call {
		}
		}

		private int stateFromInCallCallState(CallState inCallCallState) {
		switch (inCallCallState) {
		private int stateFromParcelableCallState(CallState parcelableCallState) {
		switch (parcelableCallState) {
		case NEW:
		return STATE_NEW;
		case PRE_DIAL_WAIT:
		@@ -768,7 +769,7 @@ public final class Call {
		case ABORTED:
		return STATE_DISCONNECTED;
		default:
		Log.wtf(this, "Unrecognized CallState %s", inCallCallState);
		Log.wtf(this, "Unrecognized CallState %s", parcelableCallState);
		return STATE_NEW;
		}
		}

telecomm/java/android/telecomm/InCallService.java

+4 −4

Original line number	Diff line number	Diff line
		@@ -54,10 +54,10 @@ public abstract class InCallService extends Service {
		onPhoneCreated(mPhone);
		break;
		case MSG_ADD_CALL:
		mPhone.internalAddCall((InCallCall) msg.obj);
		mPhone.internalAddCall((ParcelableCall) msg.obj);
		break;
		case MSG_UPDATE_CALL:
		mPhone.internalUpdateCall((InCallCall) msg.obj);
		mPhone.internalUpdateCall((ParcelableCall) msg.obj);
		break;
		case MSG_SET_POST_DIAL: {
		SomeArgs args = (SomeArgs) msg.obj;
		@@ -110,12 +110,12 @@ public abstract class InCallService extends Service {
		}

		@Override
		public void addCall(InCallCall call) {
		public void addCall(ParcelableCall call) {
		mHandler.obtainMessage(MSG_ADD_CALL, call).sendToTarget();
		}

		@Override
		public void updateCall(InCallCall call) {
		public void updateCall(ParcelableCall call) {
		mHandler.obtainMessage(MSG_UPDATE_CALL, call).sendToTarget();
		}

telecomm/java/android/telecomm/InCallCall.aidl→telecomm/java/android/telecomm/ParcelableCall.aidl

+1 −1

Original line number	Diff line number	Diff line
		@@ -16,4 +16,4 @@

		package android.telecomm;

		parcelable InCallCall;
		parcelable ParcelableCall;

telecomm/java/android/telecomm/InCallCall.java→telecomm/java/android/telecomm/ParcelableCall.java

+12 −11

Original line number	Diff line number	Diff line
		@@ -29,8 +29,9 @@ import java.util.List;

		/**
		* Information about a call that is used between InCallService and Telecomm.
		* @hide
		*/
		public final class InCallCall implements Parcelable {
		public final class ParcelableCall implements Parcelable {
		private final String mId;
		private final CallState mState;
		private final int mDisconnectCauseCode;
		@@ -52,7 +53,7 @@ public final class InCallCall implements Parcelable {
		private final int mVideoState;

		/** @hide */
		public InCallCall(
		public ParcelableCall(
		String id,
		CallState state,
		int disconnectCauseCode,
		@@ -214,12 +215,12 @@ public final class InCallCall implements Parcelable {
		return mVideoState;
		}

		/** Responsible for creating InCallCall objects for deserialized Parcels. */
		public static final Parcelable.Creator<InCallCall> CREATOR =
		new Parcelable.Creator<InCallCall> () {
		/** Responsible for creating ParcelableCall objects for deserialized Parcels. */
		public static final Parcelable.Creator<ParcelableCall> CREATOR =
		new Parcelable.Creator<ParcelableCall> () {
		@Override
		public InCallCall createFromParcel(Parcel source) {
		ClassLoader classLoader = InCallCall.class.getClassLoader();
		public ParcelableCall createFromParcel(Parcel source) {
		ClassLoader classLoader = ParcelableCall.class.getClassLoader();
		String id = source.readString();
		CallState state = CallState.valueOf(source.readString());
		int disconnectCauseCode = source.readInt();
		@@ -241,7 +242,7 @@ public final class InCallCall implements Parcelable {
		source.readList(childCallIds, classLoader);
		StatusHints statusHints = source.readParcelable(classLoader);
		int videoState = source.readInt();
		return new InCallCall(id, state, disconnectCauseCode, disconnectCauseMsg,
		return new ParcelableCall(id, state, disconnectCauseCode, disconnectCauseMsg,
		cannedSmsResponses, capabilities, connectTimeMillis, handle, handlePresentation,
		callerDisplayName, callerDisplayNamePresentation, gatewayInfo,
		accountHandle, callVideoProvider, parentCallId, childCallIds, statusHints,
		@@ -249,8 +250,8 @@ public final class InCallCall implements Parcelable {
		}

		@Override
		public InCallCall[] newArray(int size) {
		return new InCallCall[size];
		public ParcelableCall[] newArray(int size) {
		return new ParcelableCall[size];
		}
		};

		@@ -260,7 +261,7 @@ public final class InCallCall implements Parcelable {
		return 0;
		}

		/** Writes InCallCall object into a Parcel. */
		/** Writes ParcelableCall object into a Parcel. */
		@Override
		public void writeToParcel(Parcel destination, int flags) {
		destination.writeString(mId);