diff --git a/api/system-current.txt b/api/system-current.txt index d29f77779273f..0307d98504fb4 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -30107,9 +30107,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 class AuthenticatorService extends android.app.Service { @@ -30169,7 +30166,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(); @@ -30245,8 +30242,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 { @@ -30259,7 +30255,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(); @@ -30285,7 +30280,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); method public final void setConferenceables(java.util.List); @@ -30388,7 +30382,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); diff --git a/telecomm/java/android/telecom/AudioState.java b/telecomm/java/android/telecom/AudioState.java index 9c0331958cebc..0720df37f60f4 100644 --- a/telecomm/java/android/telecom/AudioState.java +++ b/telecomm/java/android/telecom/AudioState.java @@ -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; diff --git a/telecomm/java/android/telecom/Call.java b/telecomm/java/android/telecom/Call.java index 5c891dc2575bc..5c2a2e0702500 100644 --- a/telecomm/java/android/telecom/Call.java +++ b/telecomm/java/android/telecom/Call.java @@ -417,7 +417,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; } diff --git a/telecomm/java/android/telecom/Conference.java b/telecomm/java/android/telecom/Conference.java index ddaedcdbc366c..c37460be0ab25 100644 --- a/telecomm/java/android/telecom/Conference.java +++ b/telecomm/java/android/telecom/Conference.java @@ -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 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. diff --git a/telecomm/java/android/telecom/Connection.java b/telecomm/java/android/telecom/Connection.java index 26f5043367942..6f0c0f1b4ad5b 100644 --- a/telecomm/java/android/telecom/Connection.java +++ b/telecomm/java/android/telecom/Connection.java @@ -1004,11 +1004,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. * @@ -1215,11 +1210,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. * diff --git a/telecomm/java/android/telecom/InCallService.java b/telecomm/java/android/telecom/InCallService.java index c0c59fa29c1bf..1f7547df88ffe 100644 --- a/telecomm/java/android/telecom/InCallService.java +++ b/telecomm/java/android/telecom/InCallService.java @@ -177,7 +177,7 @@ public abstract class InCallService extends Service { * if the {@code InCallService} is not in a state where it has an associated * {@code Phone}. */ - public Phone getPhone() { + public final Phone getPhone() { return mPhone; } diff --git a/telecomm/java/android/telecom/RemoteConference.java b/telecomm/java/android/telecom/RemoteConference.java index a8879ae8aff45..3c6416b939613 100644 --- a/telecomm/java/android/telecom/RemoteConference.java +++ b/telecomm/java/android/telecom/RemoteConference.java @@ -164,11 +164,6 @@ public final class RemoteConference { return mState; } - /** @hide */ - @Deprecated public final int getCallCapabilities() { - return getConnectionCapabilities(); - } - public final int getConnectionCapabilities() { return mConnectionCapabilities; } diff --git a/telecomm/java/android/telecom/RemoteConnection.java b/telecomm/java/android/telecom/RemoteConnection.java index be7a0a04d7ac7..917fa77de66d3 100644 --- a/telecomm/java/android/telecom/RemoteConnection.java +++ b/telecomm/java/android/telecom/RemoteConnection.java @@ -73,11 +73,6 @@ public final class RemoteConnection { */ public void onRingbackRequested(RemoteConnection connection, boolean ringback) {} - /** @hide */ - @Deprecated public void onCallCapabilitiesChanged( - RemoteConnection connection, - int callCapabilities) {} - /** * Indicates that the call capabilities of this {@code RemoteConnection} have changed. * See {@link #getConnectionCapabilities()}. @@ -870,7 +865,6 @@ public final class RemoteConnection { mConnectionCapabilities = connectionCapabilities; for (Callback c : mCallbacks) { c.onConnectionCapabilitiesChanged(this, connectionCapabilities); - c.onCallCapabilitiesChanged(this, connectionCapabilities); } }