diff --git a/api/system-removed.txt b/api/system-removed.txt index 09544c11f8b76..3acc225284380 100644 --- a/api/system-removed.txt +++ b/api/system-removed.txt @@ -180,11 +180,6 @@ package android.telecom { package android.telephony { - public final class PreciseDataConnectionState implements android.os.Parcelable { - method @Deprecated @Nullable public android.net.LinkProperties getDataConnectionLinkProperties(); - method @Deprecated public int getDataConnectionNetworkType(); - } - public class TelephonyManager { method @Deprecated @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void answerRingingCall(); method @Deprecated @RequiresPermission(android.Manifest.permission.CALL_PHONE) public boolean endCall(); diff --git a/config/boot-image-profile.txt b/config/boot-image-profile.txt index 3449010ee99fa..ea7b94502521e 100644 --- a/config/boot-image-profile.txt +++ b/config/boot-image-profile.txt @@ -18839,7 +18839,6 @@ HSPLandroid/telephony/PreciseDataConnectionState;->(Landroid/os/Parcel;)V HSPLandroid/telephony/PreciseDataConnectionState;->(Landroid/os/Parcel;Landroid/telephony/PreciseDataConnectionState$1;)V HPLandroid/telephony/PreciseDataConnectionState;->equals(Ljava/lang/Object;)Z HPLandroid/telephony/PreciseDataConnectionState;->getDataConnectionApn()Ljava/lang/String; -HPLandroid/telephony/PreciseDataConnectionState;->getDataConnectionLinkProperties()Landroid/net/LinkProperties; HPLandroid/telephony/PreciseDataConnectionState;->getNetworkType()I HPLandroid/telephony/PreciseDataConnectionState;->getState()I HSPLandroid/telephony/PreciseDataConnectionState;->toString()Ljava/lang/String; diff --git a/non-updatable-api/system-removed.txt b/non-updatable-api/system-removed.txt index ab4c6d1a71a0a..0c02c43b1084e 100644 --- a/non-updatable-api/system-removed.txt +++ b/non-updatable-api/system-removed.txt @@ -165,11 +165,6 @@ package android.telecom { package android.telephony { - public final class PreciseDataConnectionState implements android.os.Parcelable { - method @Deprecated @Nullable public android.net.LinkProperties getDataConnectionLinkProperties(); - method @Deprecated public int getDataConnectionNetworkType(); - } - public class TelephonyManager { method @Deprecated @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void answerRingingCall(); method @Deprecated @RequiresPermission(android.Manifest.permission.CALL_PHONE) public boolean endCall(); diff --git a/services/core/java/com/android/server/TelephonyRegistry.java b/services/core/java/com/android/server/TelephonyRegistry.java index 3d1691df551a3..676b76704b81b 100644 --- a/services/core/java/com/android/server/TelephonyRegistry.java +++ b/services/core/java/com/android/server/TelephonyRegistry.java @@ -1707,7 +1707,7 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub { apn = preciseState.getDataConnectionApn(); state = preciseState.getState(); networkType = preciseState.getNetworkType(); - linkProps = preciseState.getDataConnectionLinkProperties(); + linkProps = preciseState.getLinkProperties(); } if (VDBG) { log("notifyDataConnectionForSubscriber: subId=" + subId diff --git a/telephony/api/system-removed.txt b/telephony/api/system-removed.txt index c7fd30438dff0..ae46075c48298 100644 --- a/telephony/api/system-removed.txt +++ b/telephony/api/system-removed.txt @@ -1,11 +1,6 @@ // Signature format: 2.0 package android.telephony { - public final class PreciseDataConnectionState implements android.os.Parcelable { - method @Deprecated @Nullable public android.net.LinkProperties getDataConnectionLinkProperties(); - method @Deprecated public int getDataConnectionNetworkType(); - } - public class TelephonyManager { method @Deprecated @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void answerRingingCall(); method @Deprecated @RequiresPermission(android.Manifest.permission.CALL_PHONE) public boolean endCall(); diff --git a/telephony/java/android/telephony/PreciseDataConnectionState.java b/telephony/java/android/telephony/PreciseDataConnectionState.java index b682bdd7aee33..8660e3825e97f 100644 --- a/telephony/java/android/telephony/PreciseDataConnectionState.java +++ b/telephony/java/android/telephony/PreciseDataConnectionState.java @@ -166,19 +166,6 @@ public final class PreciseDataConnectionState implements Parcelable { return mState; } - /** - * Returns the network type associated with this data connection. - * - * @deprecated use {@link getNetworkType()} - * @hide - * @removed Removed from the R preview SDK but was never part of the stable API surface. - */ - @Deprecated - @SystemApi - public @NetworkType int getDataConnectionNetworkType() { - return mNetworkType; - } - /** * Returns the network type associated with this data connection. * @@ -218,20 +205,6 @@ public final class PreciseDataConnectionState implements Parcelable { return mApn; } - /** - * Get the properties of the network link {@link LinkProperties}. - * - * @deprecated use {@link #getLinkProperties()} - * @hide - * @removed Removed from the R preview SDK but was never part of the stable API surface. - */ - @Deprecated - @SystemApi - @Nullable - public LinkProperties getDataConnectionLinkProperties() { - return mLinkProperties; - } - /** * Get the properties of the network link {@link LinkProperties}. */