From 0663331688f0cbc8642b7b0b0b95ac0f2c05ec3d Mon Sep 17 00:00:00 2001
From: Daniel Bright <dbright@google.com>
Date: Tue, 10 Mar 2020 15:05:17 -0700
Subject: [PATCH] Rollback @SystemApi on ApnSetting

* Remove @SystemApi from ApnSetting.TYPE_*
* Remove @SystemApi from ApnSetting.getApnTypesStringFromBitmask

Bug: 147465477
Bug: 151245732
Test: make \ flash
Merged-In: Ifc781ae494968fbaad8c591dbd990d397e0d733b
Change-Id: Ifc781ae494968fbaad8c591dbd990d397e0d733b
---
 api/system-current.txt                          | 17 -----------------
 .../java/android/telephony/data/ApnSetting.java | 15 ---------------
 2 files changed, 32 deletions(-)

diff --git a/api/system-current.txt b/api/system-current.txt
index 472e114d4f7a8..ae4b1fb59456e 100755
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -9629,23 +9629,6 @@ package android.telephony.cdma {
 
 package android.telephony.data {
 
-  public class ApnSetting implements android.os.Parcelable {
-    method @NonNull public static String getApnTypesStringFromBitmask(int);
-    field public static final String TYPE_ALL_STRING = "*";
-    field public static final String TYPE_CBS_STRING = "cbs";
-    field public static final String TYPE_DEFAULT_STRING = "default";
-    field public static final String TYPE_DUN_STRING = "dun";
-    field public static final String TYPE_EMERGENCY_STRING = "emergency";
-    field public static final String TYPE_FOTA_STRING = "fota";
-    field public static final String TYPE_HIPRI_STRING = "hipri";
-    field public static final String TYPE_IA_STRING = "ia";
-    field public static final String TYPE_IMS_STRING = "ims";
-    field public static final String TYPE_MCX_STRING = "mcx";
-    field public static final String TYPE_MMS_STRING = "mms";
-    field public static final String TYPE_SUPL_STRING = "supl";
-    field public static final String TYPE_XCAP_STRING = "xcap";
-  }
-
   public final class DataCallResponse implements android.os.Parcelable {
     method public int describeContents();
     method @NonNull public java.util.List<android.net.LinkAddress> getAddresses();
diff --git a/telephony/java/android/telephony/data/ApnSetting.java b/telephony/java/android/telephony/data/ApnSetting.java
index 0e1a8df22d469..158ada94e3c66 100644
--- a/telephony/java/android/telephony/data/ApnSetting.java
+++ b/telephony/java/android/telephony/data/ApnSetting.java
@@ -18,7 +18,6 @@ package android.telephony.data;
 import android.annotation.IntDef;
 import android.annotation.NonNull;
 import android.annotation.Nullable;
-import android.annotation.SystemApi;
 import android.content.ContentValues;
 import android.database.Cursor;
 import android.hardware.radio.V1_5.ApnTypes;
@@ -147,7 +146,6 @@ public class ApnSetting implements Parcelable {
      *
      * @hide
      */
-    @SystemApi
     public static final String TYPE_ALL_STRING = "*";
 
     /**
@@ -155,7 +153,6 @@ public class ApnSetting implements Parcelable {
      *
      * @hide
      */
-    @SystemApi
     public static final String TYPE_DEFAULT_STRING = "default";
 
 
@@ -164,7 +161,6 @@ public class ApnSetting implements Parcelable {
      *
      * @hide
      */
-    @SystemApi
     public static final String TYPE_MMS_STRING = "mms";
 
 
@@ -173,7 +169,6 @@ public class ApnSetting implements Parcelable {
      *
      * @hide
      */
-    @SystemApi
     public static final String TYPE_SUPL_STRING = "supl";
 
     /**
@@ -181,7 +176,6 @@ public class ApnSetting implements Parcelable {
      *
      * @hide
      */
-    @SystemApi
     public static final String TYPE_DUN_STRING = "dun";
 
     /**
@@ -189,7 +183,6 @@ public class ApnSetting implements Parcelable {
      *
      * @hide
      */
-    @SystemApi
     public static final String TYPE_HIPRI_STRING = "hipri";
 
     /**
@@ -197,7 +190,6 @@ public class ApnSetting implements Parcelable {
      *
      * @hide
      */
-    @SystemApi
     public static final String TYPE_FOTA_STRING = "fota";
 
     /**
@@ -205,7 +197,6 @@ public class ApnSetting implements Parcelable {
      *
      * @hide
      */
-    @SystemApi
     public static final String TYPE_IMS_STRING = "ims";
 
     /**
@@ -213,7 +204,6 @@ public class ApnSetting implements Parcelable {
      *
      * @hide
      */
-    @SystemApi
     public static final String TYPE_CBS_STRING = "cbs";
 
     /**
@@ -221,7 +211,6 @@ public class ApnSetting implements Parcelable {
      *
      * @hide
      */
-    @SystemApi
     public static final String TYPE_IA_STRING = "ia";
 
     /**
@@ -230,7 +219,6 @@ public class ApnSetting implements Parcelable {
      *
      * @hide
      */
-    @SystemApi
     public static final String TYPE_EMERGENCY_STRING = "emergency";
 
     /**
@@ -238,7 +226,6 @@ public class ApnSetting implements Parcelable {
      *
      * @hide
      */
-    @SystemApi
     public static final String TYPE_MCX_STRING = "mcx";
 
     /**
@@ -246,7 +233,6 @@ public class ApnSetting implements Parcelable {
      *
      * @hide
      */
-    @SystemApi
     public static final String TYPE_XCAP_STRING = "xcap";
 
 
@@ -1421,7 +1407,6 @@ public class ApnSetting implements Parcelable {
      * @return comma delimited list of APN types.
      * @hide
      */
-    @SystemApi
     @NonNull
     public static String getApnTypesStringFromBitmask(int apnTypeBitmask) {
         List<String> types = new ArrayList<>();