From eec778ccdd563b95050ad73dae3512493c46c273 Mon Sep 17 00:00:00 2001
From: Michael Wright <michaelwr@google.com>
Date: Mon, 30 Mar 2020 21:25:02 +0100
Subject: [PATCH] Remove replaced PreciseDataConnectionState methods from SDK.

Prior to finalization, we need to remove all methods which were
replaced but kept around for short-term compatibility purposes.
PreciseDataConnectionState had a couple methods that fell into this
category that had yet to be removed.

Bug: 152787887
Test: builds
Change-Id: Ib175b2530791cec7e31684a1d3f318c95e27f707
---
 api/system-current.txt                                       | 2 --
 api/system-removed.txt                                       | 5 +++++
 telephony/api/system-current.txt                             | 2 --
 telephony/api/system-removed.txt                             | 5 +++++
 .../java/android/telephony/PreciseDataConnectionState.java   | 2 ++
 5 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/api/system-current.txt b/api/system-current.txt
index 6d5ba34fdf9f0..043445dbef221 100755
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -10911,8 +10911,6 @@ package android.telephony {
     method @Deprecated @NonNull public String getDataConnectionApn();
     method @Deprecated public int getDataConnectionApnTypeBitMask();
     method @Deprecated public int getDataConnectionFailCause();
-    method @Deprecated @Nullable public android.net.LinkProperties getDataConnectionLinkProperties();
-    method @Deprecated public int getDataConnectionNetworkType();
     method @Deprecated public int getDataConnectionState();
   }
 
diff --git a/api/system-removed.txt b/api/system-removed.txt
index 3acc225284380..09544c11f8b76 100644
--- a/api/system-removed.txt
+++ b/api/system-removed.txt
@@ -180,6 +180,11 @@ 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/telephony/api/system-current.txt b/telephony/api/system-current.txt
index afb75bb22bee2..592338b197425 100644
--- a/telephony/api/system-current.txt
+++ b/telephony/api/system-current.txt
@@ -394,8 +394,6 @@ package android.telephony {
     method @Deprecated @NonNull public String getDataConnectionApn();
     method @Deprecated public int getDataConnectionApnTypeBitMask();
     method @Deprecated public int getDataConnectionFailCause();
-    method @Deprecated @Nullable public android.net.LinkProperties getDataConnectionLinkProperties();
-    method @Deprecated public int getDataConnectionNetworkType();
     method @Deprecated public int getDataConnectionState();
   }
 
diff --git a/telephony/api/system-removed.txt b/telephony/api/system-removed.txt
index ae46075c48298..c7fd30438dff0 100644
--- a/telephony/api/system-removed.txt
+++ b/telephony/api/system-removed.txt
@@ -1,6 +1,11 @@
 // 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 5625642d3af55..b682bdd7aee33 100644
--- a/telephony/java/android/telephony/PreciseDataConnectionState.java
+++ b/telephony/java/android/telephony/PreciseDataConnectionState.java
@@ -171,6 +171,7 @@ public final class PreciseDataConnectionState implements Parcelable {
      *
      * @deprecated use {@link getNetworkType()}
      * @hide
+     * @removed Removed from the R preview SDK but was never part of the stable API surface.
      */
     @Deprecated
     @SystemApi
@@ -222,6 +223,7 @@ public final class PreciseDataConnectionState implements Parcelable {
      *
      * @deprecated use {@link #getLinkProperties()}
      * @hide
+     * @removed Removed from the R preview SDK but was never part of the stable API surface.
      */
     @Deprecated
     @SystemApi