Merge "API cleanup for RemoteConnection." into lmp-dev (6f90967b) · Commits · e / os / android_frameworks_base

api/current.txt

+19 −23

Original line number	Diff line number	Diff line
		@@ -28241,6 +28241,8 @@ package android.telecomm {
		method public static android.telecomm.Connection createCanceledConnection();
		method public static android.telecomm.Connection createFailedConnection(int, java.lang.String);
		method public final void destroy();
		method public final android.net.Uri getAddress();
		method public final int getAddressPresentation();
		method public final boolean getAudioModeIsVoip();
		method public final android.telecomm.AudioState getAudioState();
		method public final int getCallCapabilities();
		@@ -28250,11 +28252,9 @@ package android.telecomm {
		method public final java.util.List<android.telecomm.Connection> getConferenceableConnections();
		method public final int getDisconnectCause();
		method public final java.lang.String getDisconnectMessage();
		method public final android.net.Uri getHandle();
		method public final int getHandlePresentation();
		method public final int getState();
		method public final android.telecomm.StatusHints getStatusHints();
		method public final boolean isRequestingRingback();
		method public final boolean isRingbackRequested();
		method public void onAbort();
		method public void onAnswer();
		method public void onAudioStateChanged(android.telecomm.AudioState);
		@@ -28269,6 +28269,7 @@ package android.telecomm {
		method public void onStopDtmfTone();
		method public void onUnhold();
		method public final void setActive();
		method public final void setAddress(android.net.Uri, int);
		method public final void setAudioModeIsVoip(boolean);
		method public final void setCallCapabilities(int);
		method public final void setCallerDisplayName(java.lang.String, int);
		@@ -28276,12 +28277,11 @@ package android.telecomm {
		method public final void setConnectionService(android.telecomm.ConnectionService);
		method public final void setDialing();
		method public final void setDisconnected(int, java.lang.String);
		method public final void setHandle(android.net.Uri, int);
		method public final void setInitialized();
		method public final void setInitializing();
		method public final void setOnHold();
		method public final void setPostDialWait(java.lang.String);
		method public final void setRequestingRingback(boolean);
		method public final void setRingbackRequested(boolean);
		method public final void setRinging();
		method public final void setStatusHints(android.telecomm.StatusHints);
		method public static java.lang.String stateToString(int);
		@@ -28389,7 +28389,6 @@ package android.telecomm {
		}

		public final class RemoteConference {
		method public final void addCallback(android.telecomm.RemoteConference.Callback);
		method public void disconnect();
		method public final int getCallCapabilities();
		method public final java.util.List<android.telecomm.RemoteConnection> getConnections();
		@@ -28397,9 +28396,10 @@ package android.telecomm {
		method public java.lang.String getDisconnectMessage();
		method public final int getState();
		method public void hold();
		method public final void removeCallback(android.telecomm.RemoteConference.Callback);
		method public final void registerCallback(android.telecomm.RemoteConference.Callback);
		method public void separate(android.telecomm.RemoteConnection);
		method public void unhold();
		method public final void unregisterCallback(android.telecomm.RemoteConference.Callback);
		}

		public static abstract class RemoteConference.Callback {
		@@ -28414,52 +28414,48 @@ package android.telecomm {

		public final class RemoteConnection {
		method public void abort();
		method public void addListener(android.telecomm.RemoteConnection.Listener);
		method public void answer();
		method public void disconnect();
		method public boolean getAudioModeIsVoip();
		method public android.net.Uri getAddress();
		method public int getAddressPresentation();
		method public int getCallCapabilities();
		method public java.lang.String getCallerDisplayName();
		method public java.lang.CharSequence getCallerDisplayName();
		method public int getCallerDisplayNamePresentation();
		method public java.util.List<android.telecomm.RemoteConnection> getChildren();
		method public android.telecomm.RemoteConference getConference();
		method public java.util.List<android.telecomm.RemoteConnection> getConferenceableConnections();
		method public int getDisconnectCauseCode();
		method public java.lang.String getDisconnectCauseMessage();
		method public int getFailureCode();
		method public java.lang.String getFailureMessage();
		method public android.net.Uri getHandle();
		method public int getHandlePresentation();
		method public android.telecomm.RemoteConnection getParent();
		method public int getState();
		method public android.telecomm.StatusHints getStatusHints();
		method public void hold();
		method public boolean isRequestingRingback();
		method public boolean isRingbackRequested();
		method public boolean isVoipAudioMode();
		method public void playDtmfTone(char);
		method public void postDialContinue(boolean);
		method public void registerCallback(android.telecomm.RemoteConnection.Callback);
		method public void reject();
		method public void removeListener(android.telecomm.RemoteConnection.Listener);
		method public void setAudioState(android.telecomm.AudioState);
		method public void stopDtmfTone();
		method public void unhold();
		method public void unregisterCallback(android.telecomm.RemoteConnection.Callback);
		}

		public static abstract class RemoteConnection.Listener {
		ctor public RemoteConnection.Listener();
		method public void onAudioModeIsVoipChanged(android.telecomm.RemoteConnection, boolean);
		public static abstract class RemoteConnection.Callback {
		ctor public RemoteConnection.Callback();
		method public void onAddressChanged(android.telecomm.RemoteConnection, android.net.Uri, int);
		method public void onCallCapabilitiesChanged(android.telecomm.RemoteConnection, int);
		method public void onCallerDisplayNameChanged(android.telecomm.RemoteConnection, java.lang.String, int);
		method public void onChildrenChanged(android.telecomm.RemoteConnection, java.util.List<android.telecomm.RemoteConnection>);
		method public void onConferenceChanged(android.telecomm.RemoteConnection, android.telecomm.RemoteConference);
		method public void onConferenceableConnectionsChanged(android.telecomm.RemoteConnection, java.util.List<android.telecomm.RemoteConnection>);
		method public void onDestroyed(android.telecomm.RemoteConnection);
		method public void onDisconnected(android.telecomm.RemoteConnection, int, java.lang.String);
		method public void onHandleChanged(android.telecomm.RemoteConnection, android.net.Uri, int);
		method public void onParentChanged(android.telecomm.RemoteConnection, android.telecomm.RemoteConnection);
		method public void onPostDialWait(android.telecomm.RemoteConnection, java.lang.String);
		method public void onRequestingRingback(android.telecomm.RemoteConnection, boolean);
		method public void onRingbackRequested(android.telecomm.RemoteConnection, boolean);
		method public void onStateChanged(android.telecomm.RemoteConnection, int);
		method public void onStatusHintsChanged(android.telecomm.RemoteConnection, android.telecomm.StatusHints);
		method public void onVoipAudioChanged(android.telecomm.RemoteConnection, boolean);
		}

		public final class StatusHints implements android.os.Parcelable {

telecomm/java/android/telecomm/Connection.java

+26 −26

Original line number	Diff line number	Diff line
		@@ -68,13 +68,13 @@ public abstract class Connection {
		/** @hide */
		public abstract static class Listener {
		public void onStateChanged(Connection c, int state) {}
		public void onHandleChanged(Connection c, Uri newHandle, int presentation) {}
		public void onAddressChanged(Connection c, Uri newAddress, int presentation) {}
		public void onCallerDisplayNameChanged(
		Connection c, String callerDisplayName, int presentation) {}
		public void onVideoStateChanged(Connection c, int videoState) {}
		public void onDisconnected(Connection c, int cause, String message) {}
		public void onPostDialWait(Connection c, String remaining) {}
		public void onRequestingRingback(Connection c, boolean ringback) {}
		public void onRingbackRequested(Connection c, boolean ringback) {}
		public void onDestroyed(Connection c) {}
		public void onCallCapabilitiesChanged(Connection c, int callCapabilities) {}
		public void onVideoProviderChanged(
		@@ -464,11 +464,11 @@ public abstract class Connection {

		private int mState = STATE_NEW;
		private AudioState mAudioState;
		private Uri mHandle;
		private int mHandlePresentation;
		private Uri mAddress;
		private int mAddressPresentation;
		private String mCallerDisplayName;
		private int mCallerDisplayNamePresentation;
		private boolean mRequestingRingback = false;
		private boolean mRingbackRequested = false;
		private int mCallCapabilities;
		private VideoProvider mVideoProvider;
		private boolean mAudioModeIsVoip;
		@@ -485,18 +485,18 @@ public abstract class Connection {
		public Connection() {}

		/**
		* @return The handle (e.g., phone number) to which this Connection is currently communicating.
		* @return The address (e.g., phone number) to which this Connection is currently communicating.
		*/
		public final Uri getHandle() {
		return mHandle;
		public final Uri getAddress() {
		return mAddress;
		}

		/**
		* @return The presentation requirements for the handle.
		* @return The presentation requirements for the address.
		* See {@link TelecommManager} for valid values.
		*/
		public final int getHandlePresentation() {
		return mHandlePresentation;
		public final int getAddressPresentation() {
		return mAddressPresentation;
		}

		/**
		@@ -556,8 +556,8 @@ public abstract class Connection {
		* Returns whether this connection is requesting that the system play a ringback tone
		* on its behalf.
		*/
		public final boolean isRequestingRingback() {
		return mRequestingRingback;
		public final boolean isRingbackRequested() {
		return mRingbackRequested;
		}

		/**
		@@ -662,18 +662,18 @@ public abstract class Connection {
		}

		/**
		* Sets the value of the {@link #getHandle()} property.
		* Sets the value of the {@link #getAddress()} property.
		*
		* @param handle The new handle.
		* @param presentation The presentation requirements for the handle.
		* @param address The new address.
		* @param presentation The presentation requirements for the address.
		* See {@link TelecommManager} for valid values.
		*/
		public final void setHandle(Uri handle, int presentation) {
		Log.d(this, "setHandle %s", handle);
		mHandle = handle;
		mHandlePresentation = presentation;
		public final void setAddress(Uri address, int presentation) {
		Log.d(this, "setAddress %s", address);
		mAddress = address;
		mAddressPresentation = presentation;
		for (Listener l : mListeners) {
		l.onHandleChanged(this, handle, presentation);
		l.onAddressChanged(this, address, presentation);
		}
		}

		@@ -716,7 +716,7 @@ public abstract class Connection {
		* communicate).
		*/
		public final void setActive() {
		setRequestingRingback(false);
		setRingbackRequested(false);
		setState(STATE_ACTIVE);
		}

		@@ -804,11 +804,11 @@ public abstract class Connection {
		*
		* @param ringback Whether the ringback tone is to be played.
		*/
		public final void setRequestingRingback(boolean ringback) {
		if (mRequestingRingback != ringback) {
		mRequestingRingback = ringback;
		public final void setRingbackRequested(boolean ringback) {
		if (mRingbackRequested != ringback) {
		mRingbackRequested = ringback;
		for (Listener l : mListeners) {
		l.onRequestingRingback(this, ringback);
		l.onRingbackRequested(this, ringback);
		}
		}
		}

telecomm/java/android/telecomm/ConnectionService.java

+10 −10

Original line number	Diff line number	Diff line
		@@ -414,9 +414,9 @@ public abstract class ConnectionService extends Service {
		}

		@Override
		public void onHandleChanged(Connection c, Uri handle, int presentation) {
		public void onAddressChanged(Connection c, Uri address, int presentation) {
		String id = mIdByConnection.get(c);
		mAdapter.setHandle(id, handle, presentation);
		mAdapter.setAddress(id, address, presentation);
		}

		@Override
		@@ -439,10 +439,10 @@ public abstract class ConnectionService extends Service {
		}

		@Override
		public void onRequestingRingback(Connection c, boolean ringback) {
		public void onRingbackRequested(Connection c, boolean ringback) {
		String id = mIdByConnection.get(c);
		Log.d(this, "Adapter onRingback %b", ringback);
		mAdapter.setRequestingRingback(id, ringback);
		mAdapter.setRingbackRequested(id, ringback);
		}

		@Override
		@@ -462,7 +462,7 @@ public abstract class ConnectionService extends Service {
		@Override
		public void onAudioModeIsVoipChanged(Connection c, boolean isVoip) {
		String id = mIdByConnection.get(c);
		mAdapter.setAudioModeIsVoip(id, isVoip);
		mAdapter.setIsVoipAudioMode(id, isVoip);
		}

		@Override
		@@ -523,8 +523,8 @@ public abstract class ConnectionService extends Service {
		addConnection(callId, connection);
		}

		Uri handle = connection.getHandle();
		String number = handle == null ? "null" : handle.getSchemeSpecificPart();
		Uri address = connection.getAddress();
		String number = address == null ? "null" : address.getSchemeSpecificPart();
		Log.v(this, "createConnection, number: %s, state: %s, capabilities: %s",
		Connection.toLogSafePhoneNumber(number),
		Connection.stateToString(connection.getState()),
		@@ -538,14 +538,14 @@ public abstract class ConnectionService extends Service {
		request.getAccountHandle(),
		connection.getState(),
		connection.getCallCapabilities(),
		connection.getHandle(),
		connection.getHandlePresentation(),
		connection.getAddress(),
		connection.getAddressPresentation(),
		connection.getCallerDisplayName(),
		connection.getCallerDisplayNamePresentation(),
		connection.getVideoProvider() == null ?
		null : connection.getVideoProvider().getInterface(),
		connection.getVideoState(),
		connection.isRequestingRingback(),
		connection.isRingbackRequested(),
		connection.getAudioModeIsVoip(),
		connection.getStatusHints(),
		connection.getDisconnectCause(),

telecomm/java/android/telecomm/ConnectionServiceAdapter.java

+6 −6

Original line number	Diff line number	Diff line
		@@ -168,10 +168,10 @@ final class ConnectionServiceAdapter implements DeathRecipient {
		* @param callId The unique ID of the call whose ringback is being changed.
		* @param ringback Whether Telecomm should start playing a ringback tone.
		*/
		void setRequestingRingback(String callId, boolean ringback) {
		void setRingbackRequested(String callId, boolean ringback) {
		for (IConnectionServiceAdapter adapter : mAdapters) {
		try {
		adapter.setRequestingRingback(callId, ringback);
		adapter.setRingbackRequested(callId, ringback);
		} catch (RemoteException e) {
		}
		}
		@@ -280,10 +280,10 @@ final class ConnectionServiceAdapter implements DeathRecipient {
		* @param callId The unique ID of the call to set with the given call video provider.
		* @param isVoip True if the audio mode is VOIP.
		*/
		void setAudioModeIsVoip(String callId, boolean isVoip) {
		void setIsVoipAudioMode(String callId, boolean isVoip) {
		for (IConnectionServiceAdapter adapter : mAdapters) {
		try {
		adapter.setAudioModeIsVoip(callId, isVoip);
		adapter.setIsVoipAudioMode(callId, isVoip);
		} catch (RemoteException e) {
		}
		}
		@@ -298,10 +298,10 @@ final class ConnectionServiceAdapter implements DeathRecipient {
		}
		}

		void setHandle(String callId, Uri handle, int presentation) {
		void setAddress(String callId, Uri address, int presentation) {
		for (IConnectionServiceAdapter adapter : mAdapters) {
		try {
		adapter.setHandle(callId, handle, presentation);
		adapter.setAddress(callId, address, presentation);
		} catch (RemoteException e) {
		}
		}

telecomm/java/android/telecomm/ConnectionServiceAdapterServant.java

+16 −16

Original line number	Diff line number	Diff line
		@@ -44,7 +44,7 @@ final class ConnectionServiceAdapterServant {
		private static final int MSG_SET_DIALING = 4;
		private static final int MSG_SET_DISCONNECTED = 5;
		private static final int MSG_SET_ON_HOLD = 6;
		private static final int MSG_SET_REQUESTING_RINGBACK = 7;
		private static final int MSG_SET_RINGBACK_REQUESTED = 7;
		private static final int MSG_SET_CALL_CAPABILITIES = 8;
		private static final int MSG_SET_IS_CONFERENCED = 9;
		private static final int MSG_ADD_CONFERENCE_CALL = 10;
		@@ -53,9 +53,9 @@ final class ConnectionServiceAdapterServant {
		private static final int MSG_QUERY_REMOTE_CALL_SERVICES = 13;
		private static final int MSG_SET_VIDEO_STATE = 14;
		private static final int MSG_SET_VIDEO_CALL_PROVIDER = 15;
		private static final int MSG_SET_AUDIO_MODE_IS_VOIP = 16;
		private static final int MSG_SET_IS_VOIP_AUDIO_MODE = 16;
		private static final int MSG_SET_STATUS_HINTS = 17;
		private static final int MSG_SET_HANDLE = 18;
		private static final int MSG_SET_ADDRESS = 18;
		private static final int MSG_SET_CALLER_DISPLAY_NAME = 19;
		private static final int MSG_SET_CONFERENCEABLE_CONNECTIONS = 20;

		@@ -107,8 +107,8 @@ final class ConnectionServiceAdapterServant {
		case MSG_SET_ON_HOLD:
		mDelegate.setOnHold((String) msg.obj);
		break;
		case MSG_SET_REQUESTING_RINGBACK:
		mDelegate.setRequestingRingback((String) msg.obj, msg.arg1 == 1);
		case MSG_SET_RINGBACK_REQUESTED:
		mDelegate.setRingbackRequested((String) msg.obj, msg.arg1 == 1);
		break;
		case MSG_SET_CALL_CAPABILITIES:
		mDelegate.setCallCapabilities((String) msg.obj, msg.arg1);
		@@ -160,8 +160,8 @@ final class ConnectionServiceAdapterServant {
		}
		break;
		}
		case MSG_SET_AUDIO_MODE_IS_VOIP:
		mDelegate.setAudioModeIsVoip((String) msg.obj, msg.arg1 == 1);
		case MSG_SET_IS_VOIP_AUDIO_MODE:
		mDelegate.setIsVoipAudioMode((String) msg.obj, msg.arg1 == 1);
		break;
		case MSG_SET_STATUS_HINTS: {
		SomeArgs args = (SomeArgs) msg.obj;
		@@ -172,10 +172,10 @@ final class ConnectionServiceAdapterServant {
		}
		break;
		}
		case MSG_SET_HANDLE: {
		case MSG_SET_ADDRESS: {
		SomeArgs args = (SomeArgs) msg.obj;
		try {
		mDelegate.setHandle((String) args.arg1, (Uri) args.arg2, args.argi1);
		mDelegate.setAddress((String) args.arg1, (Uri) args.arg2, args.argi1);
		} finally {
		args.recycle();
		}
		@@ -249,8 +249,8 @@ final class ConnectionServiceAdapterServant {
		}

		@Override
		public void setRequestingRingback(String connectionId, boolean ringback) {
		mHandler.obtainMessage(MSG_SET_REQUESTING_RINGBACK, ringback ? 1 : 0, 0, connectionId)
		public void setRingbackRequested(String connectionId, boolean ringback) {
		mHandler.obtainMessage(MSG_SET_RINGBACK_REQUESTED, ringback ? 1 : 0, 0, connectionId)
		.sendToTarget();
		}

		@@ -308,8 +308,8 @@ final class ConnectionServiceAdapterServant {
		}

		@Override
		public final void setAudioModeIsVoip(String connectionId, boolean isVoip) {
		mHandler.obtainMessage(MSG_SET_AUDIO_MODE_IS_VOIP, isVoip ? 1 : 0, 0,
		public final void setIsVoipAudioMode(String connectionId, boolean isVoip) {
		mHandler.obtainMessage(MSG_SET_IS_VOIP_AUDIO_MODE, isVoip ? 1 : 0, 0,
		connectionId).sendToTarget();
		}

		@@ -322,12 +322,12 @@ final class ConnectionServiceAdapterServant {
		}

		@Override
		public final void setHandle(String connectionId, Uri handle, int presentation) {
		public final void setAddress(String connectionId, Uri address, int presentation) {
		SomeArgs args = SomeArgs.obtain();
		args.arg1 = connectionId;
		args.arg2 = handle;
		args.arg2 = address;
		args.argi1 = presentation;
		mHandler.obtainMessage(MSG_SET_HANDLE, args).sendToTarget();
		mHandler.obtainMessage(MSG_SET_ADDRESS, args).sendToTarget();
		}

		@Override