Merge "Remove startActivityFromInCall API" into lmp-dev (4d12a037) · Commits · e / os / android_frameworks_base

api/current.txt

+0 −2

Original line number	Diff line number	Diff line
		@@ -28267,7 +28267,6 @@ package android.telecomm {
		method public final void setRequestingRingback(boolean);
		method public final void setRinging();
		method public final void setStatusHints(android.telecomm.StatusHints);
		method public final void startActivityFromInCall(android.app.PendingIntent);
		method public static java.lang.String stateToString(int);
		field public static final int STATE_ACTIVE = 4; // 0x4
		field public static final int STATE_DIALING = 3; // 0x3
		@@ -28452,7 +28451,6 @@ package android.telecomm {
		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 onStartActivityFromInCall(android.telecomm.RemoteConnection, android.app.PendingIntent);
		method public void onStateChanged(android.telecomm.RemoteConnection, int);
		method public void onStatusHintsChanged(android.telecomm.RemoteConnection, android.telecomm.StatusHints);
		}

+0 −19

Original line number	Diff line number	Diff line
		@@ -346,14 +346,6 @@ public final class Call {
		*/
		public void onVideoCallChanged(Call call, InCallService.VideoCall videoCall) {}

		/**
		* Launches an activity for this connection on top of the in-call UI.
		*
		* @param call The {@code Call} invoking this method.
		* @param intent The intent to use to start the activity.
		*/
		public void onStartActivity(Call call, PendingIntent intent) {}

		/**
		* Invoked when the {@code Call} is destroyed. Clients should refrain from cleaning
		* up their UI for the {@code Call} in response to state transitions. Specifically,
		@@ -752,11 +744,6 @@ public final class Call {
		firePostDialWait(mRemainingPostDialSequence);
		}

		/** {@hide} */
		final void internalStartActivity(PendingIntent intent) {
		fireStartActivity(intent);
		}

		/** {@hide} */
		final void internalSetDisconnected() {
		if (mState != Call.STATE_DISCONNECTED) {
		@@ -809,12 +796,6 @@ public final class Call {
		}
		}

		private void fireStartActivity(PendingIntent intent) {
		for (Listener listener : mListeners) {
		listener.onStartActivity(this, intent);
		}
		}

		private void fireCallDestroyed() {
		for (Listener listener : mListeners) {
		listener.onCallDestroyed(this);

+0 −15

Original line number	Diff line number	Diff line
		@@ -81,7 +81,6 @@ public abstract class Connection {
		Connection c, VideoProvider videoProvider) {}
		public void onAudioModeIsVoipChanged(Connection c, boolean isVoip) {}
		public void onStatusHintsChanged(Connection c, StatusHints statusHints) {}
		public void onStartActivityFromInCall(Connection c, PendingIntent intent) {}
		public void onConferenceableConnectionsChanged(
		Connection c, List<Connection> conferenceableConnections) {}
		public void onConferenceChanged(Connection c, Conference conference) {}
		@@ -941,20 +940,6 @@ public abstract class Connection {
		}
		}

		/**
		* Launches an activity for this connection on top of the in-call UI.
		*
		* @param intent The intent to use to start the activity.
		*/
		public final void startActivityFromInCall(PendingIntent intent) {
		if (!intent.isActivity()) {
		throw new IllegalArgumentException("Activity intent required.");
		}
		for (Listener l : mListeners) {
		l.onStartActivityFromInCall(this, intent);
		}
		}

		/**
		* Notifies this Connection that the {@link #getAudioState()} property has a new value.
		*

+0 −6

Original line number	Diff line number	Diff line
		@@ -462,12 +462,6 @@ public abstract class ConnectionService extends Service {
		mAdapter.setStatusHints(id, statusHints);
		}

		@Override
		public void onStartActivityFromInCall(Connection c, PendingIntent intent) {
		String id = mIdByConnection.get(c);
		mAdapter.startActivityFromInCall(id, intent);
		}

		@Override
		public void onConferenceableConnectionsChanged(
		Connection connection, List<Connection> conferenceableConnections) {

+0 −9

Original line number	Diff line number	Diff line
		@@ -346,13 +346,4 @@ final class ConnectionServiceAdapter implements DeathRecipient {
		}
		}
		}

		void startActivityFromInCall(String callId, PendingIntent intent) {
		for (IConnectionServiceAdapter adapter : mAdapters) {
		try {
		adapter.startActivityFromInCall(callId, intent);
		} catch (RemoteException e) {
		}
		}
		}
		}