Remove Deprecated-At-Birth APIs from PDCS

Two APIs were added as @SystemApi and then @Deprecated within
the same API level (RVC). These methods were never exposed
publicly, and instead were replaced with more-appropriate
named methods that were added to the public API. As such they
were not fully deleted in RVC but were never exposed and expected
to be deleted following SDK finalization. This CL does precisely
that - removes all traces of these methods, as per the will of
the API Council.

-Remove #getDataConnectionLinkProperties()
-Remove #getDataConnectionNetworkType()

Bug: 152787887
Test: make update-api && make
Merged-In: I89463b0bd641e9316f90fe4f535d326f6e74a061
Change-Id: I89463b0bd641e9316f90fe4f535d326f6e74a061
(cherry picked from commit 3a47293cb4624c1dd1cceab49cfbe761349add05)

6 files changed, 1 insertions, 44 deletions

diff --git a/api/system-removed.txt b/api/system-removed.txt
index 09544c11f8b7..3acc22528438 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 30826e036c40..09aaf5bc3d97 100644
--- a/config/boot-image-profile.txt
+++ b/config/boot-image-profile.txt
@@ -18839,7 +18839,6 @@ HSPLandroid/telephony/PreciseDataConnectionState;-><init>(Landroid/os/Parcel;)V
 HSPLandroid/telephony/PreciseDataConnectionState;-><init>(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 ab4c6d1a71a0..0c02c43b1084 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 fd5a621f1a25..4798c7711553 100644
--- a/services/core/java/com/android/server/TelephonyRegistry.java
+++ b/services/core/java/com/android/server/TelephonyRegistry.java
@@ -1708,7 +1708,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 c7fd30438dff..ae46075c4829 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 b682bdd7aee3..8660e3825e97 100644
--- a/telephony/java/android/telephony/PreciseDataConnectionState.java
+++ b/telephony/java/android/telephony/PreciseDataConnectionState.java
@@ -169,19 +169,6 @@ public final class PreciseDataConnectionState implements Parcelable {
     /**
      * 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.
-     *
      * Return the current/latest (radio) bearer technology that carries this data connection.
      * For a variety of reasons, the network type can change during the life of the data
      * connection, and this information is not reliable unless the physical link is currently
@@ -220,20 +207,6 @@ public final class PreciseDataConnectionState implements Parcelable {
 
     /**
      * 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}.
      */
     @Nullable
     public LinkProperties getLinkProperties() {