Merge "Remove deprecated telecom APIs. Mark others final." (773535cf) · Commits · e / os / android_frameworks_base

api/system-current.txt

+3 −9

Original line number	Diff line number	Diff line
		@@ -31849,9 +31849,6 @@ package android.telecom {
		field public static final int ROUTE_SPEAKER = 8; // 0x8
		field public static final int ROUTE_WIRED_HEADSET = 4; // 0x4
		field public static final int ROUTE_WIRED_OR_EARPIECE = 5; // 0x5
		field public final boolean isMuted;
		field public final int route;
		field public final int supportedRouteMask;
		}

		public final class Call {
		@@ -31895,7 +31892,7 @@ package android.telecom {
		method public int getCallProperties();
		method public java.lang.String getCallerDisplayName();
		method public int getCallerDisplayNamePresentation();
		method public long getConnectTimeMillis();
		method public final long getConnectTimeMillis();
		method public android.telecom.DisconnectCause getDisconnectCause();
		method public android.os.Bundle getExtras();
		method public android.telecom.GatewayInfo getGatewayInfo();
		@@ -31971,8 +31968,7 @@ package android.telecom {
		method public final void setConnectionCapabilities(int);
		method public final void setDisconnected(android.telecom.DisconnectCause);
		method public final void setOnHold();
		field public static long CONNECT_TIME_NOT_SPECIFIED;
		field protected android.telecom.PhoneAccountHandle mPhoneAccount;
		field public static final long CONNECT_TIME_NOT_SPECIFIED = 0L; // 0x0L
		}

		public abstract class Connection implements android.telecom.IConferenceable {
		@@ -31985,7 +31981,6 @@ package android.telecom {
		method public final int getAddressPresentation();
		method public final boolean getAudioModeIsVoip();
		method public final android.telecom.AudioState getAudioState();
		method public final deprecated int getCallCapabilities();
		method public final java.lang.String getCallerDisplayName();
		method public final int getCallerDisplayNamePresentation();
		method public final android.telecom.Conference getConference();
		@@ -32011,7 +32006,6 @@ package android.telecom {
		method public final void setActive();
		method public final void setAddress(android.net.Uri, int);
		method public final void setAudioModeIsVoip(boolean);
		method public final deprecated void setCallCapabilities(int);
		method public final void setCallerDisplayName(java.lang.String, int);
		method public final void setConferenceableConnections(java.util.List<android.telecom.Connection>);
		method public final void setConferenceables(java.util.List<android.telecom.IConferenceable>);
		@@ -32115,7 +32109,7 @@ package android.telecom {

		public abstract class InCallService extends android.app.Service {
		ctor public InCallService();
		method public android.telecom.Phone getPhone();
		method public final android.telecom.Phone getPhone();
		method public android.os.IBinder onBind(android.content.Intent);
		method public void onPhoneCreated(android.telecom.Phone);
		method public void onPhoneDestroyed(android.telecom.Phone);

telecomm/java/android/telecom/AudioState.java

+3 −8

Original line number	Diff line number	Diff line
		@@ -54,14 +54,9 @@ public final class AudioState implements Parcelable {
		public static final int ROUTE_ALL = ROUTE_EARPIECE \| ROUTE_BLUETOOTH \| ROUTE_WIRED_HEADSET \|
		ROUTE_SPEAKER;

		/** Note: Deprecated, please do not use if possible. */
		@SystemApi public final boolean isMuted;

		/** Note: Deprecated, please do not use if possible. */
		@SystemApi public final int route;

		/** Note: Deprecated, please do not use if possible. */
		@SystemApi public final int supportedRouteMask;
		private final boolean isMuted;
		private final int route;
		private final int supportedRouteMask;

		public AudioState(boolean muted, int route, int supportedRouteMask) {
		this.isMuted = muted;

telecomm/java/android/telecom/Call.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -407,7 +407,7 @@ public final class Call {
		* periodically, but user interfaces should not rely on this to display any "call time
		* clock".
		*/
		public long getConnectTimeMillis() {
		public final long getConnectTimeMillis() {
		return mConnectTimeMillis;
		}

telecomm/java/android/telecom/Conference.java

+2 −12

Original line number	Diff line number	Diff line
		@@ -38,7 +38,7 @@ public abstract class Conference implements IConferenceable {
		* Used to indicate that the conference connection time is not specified. If not specified,
		* Telecom will set the connect time.
		*/
		public static long CONNECT_TIME_NOT_SPECIFIED = 0;
		public static final long CONNECT_TIME_NOT_SPECIFIED = 0;

		/** @hide */
		public abstract static class Listener {
		@@ -63,7 +63,7 @@ public abstract class Conference implements IConferenceable {
		private final List<Connection> mUnmodifiableConferenceableConnections =
		Collections.unmodifiableList(mConferenceableConnections);

		protected PhoneAccountHandle mPhoneAccount;
		private PhoneAccountHandle mPhoneAccount;
		private AudioState mAudioState;
		private int mState = Connection.STATE_NEW;
		private DisconnectCause mDisconnectCause;
		@@ -116,11 +116,6 @@ public abstract class Conference implements IConferenceable {
		return mState;
		}

		/** @hide */
		@Deprecated public final int getCapabilities() {
		return getConnectionCapabilities();
		}

		/**
		* Returns the capabilities of a conference. See {@code CAPABILITY_*} constants in class
		* {@link Connection} for valid values.
		@@ -301,11 +296,6 @@ public abstract class Conference implements IConferenceable {
		return mDisconnectCause;
		}

		/** @hide */
		@Deprecated public final void setCapabilities(int connectionCapabilities) {
		setConnectionCapabilities(connectionCapabilities);
		}

		/**
		* Sets the capabilities of a conference. See {@code CAPABILITY_*} constants of class
		* {@link Connection} for valid values.

telecomm/java/android/telecom/Connection.java

+0 −10

Original line number	Diff line number	Diff line
		@@ -994,11 +994,6 @@ public abstract class Connection implements IConferenceable {
		return mConnectionCapabilities;
		}

		/** @hide */
		@SystemApi @Deprecated public final int getCallCapabilities() {
		return getConnectionCapabilities();
		}

		/**
		* Sets the value of the {@link #getAddress()} property.
		*
		@@ -1202,11 +1197,6 @@ public abstract class Connection implements IConferenceable {
		}
		}

		/** @hide */
		@SystemApi @Deprecated public final void setCallCapabilities(int connectionCapabilities) {
		setConnectionCapabilities(connectionCapabilities);
		}

		/**
		* Sets the connection's capabilities as a bit mask of the {@code CAPABILITY_*} constants.
		*