From c73028e9f288f039fee85c07f6366ba860a632ca Mon Sep 17 00:00:00 2001
From: zoey chen <zoeychen@google.com>
Date: Mon, 16 Mar 2020 12:18:11 +0800
Subject: [PATCH] [TelephonyMainline] @hide @SystemApi and revisit them in S. -
 CarrierColumns

Test: manual
Bug: 144455212
Change-Id: I719ee0a4d23dcb7786954fe2741f3830d3d3a5bc
Merged-In: I719ee0a4d23dcb7786954fe2741f3830d3d3a5bc
---
 api/system-current.txt                    | 26 -----------------------
 core/java/android/provider/Telephony.java |  2 --
 2 files changed, 28 deletions(-)

diff --git a/api/system-current.txt b/api/system-current.txt
index 67c6a2a927f6b..2b5d8cbb2ac94 100755
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -6898,32 +6898,6 @@ package android.provider {
     field public static final int VOLUME_HUSH_VIBRATE = 1; // 0x1
   }
 
-  public static interface Telephony.CarrierColumns extends android.provider.BaseColumns {
-    field @NonNull public static final android.net.Uri CONTENT_URI;
-    field public static final String EXPIRATION_TIME = "expiration_time";
-    field public static final String KEY_IDENTIFIER = "key_identifier";
-    field public static final String KEY_TYPE = "key_type";
-    field public static final String LAST_MODIFIED = "last_modified";
-    field public static final String MCC = "mcc";
-    field public static final String MNC = "mnc";
-    field public static final String MVNO_MATCH_DATA = "mvno_match_data";
-    field public static final String MVNO_TYPE = "mvno_type";
-    field public static final String PUBLIC_KEY = "public_key";
-  }
-
-  public static final class Telephony.CarrierId.All implements android.provider.BaseColumns {
-    field public static final String APN = "apn";
-    field @NonNull public static final android.net.Uri CONTENT_URI;
-    field public static final String GID1 = "gid1";
-    field public static final String GID2 = "gid2";
-    field public static final String ICCID_PREFIX = "iccid_prefix";
-    field public static final String IMSI_PREFIX_XPATTERN = "imsi_prefix_xpattern";
-    field public static final String MCCMNC = "mccmnc";
-    field public static final String PLMN = "plmn";
-    field public static final String PRIVILEGE_ACCESS_RULE = "privilege_access_rule";
-    field public static final String SPN = "spn";
-  }
-
   public static final class Telephony.Carriers implements android.provider.BaseColumns {
     field public static final String APN_SET_ID = "apn_set_id";
     field public static final int CARRIER_EDITED = 4; // 0x4
diff --git a/core/java/android/provider/Telephony.java b/core/java/android/provider/Telephony.java
index a897a8e4994a3..b7c6f684fbcd1 100644
--- a/core/java/android/provider/Telephony.java
+++ b/core/java/android/provider/Telephony.java
@@ -1365,7 +1365,6 @@ public final class Telephony {
      * Base column for the table that contain Carrier Public key.
      * @hide
      */
-    @SystemApi
     public interface CarrierColumns extends BaseColumns {
 
         /**
@@ -4864,7 +4863,6 @@ public final class Telephony {
          * Contains mappings between matching rules with carrier id for all carriers.
          * @hide
          */
-        @SystemApi
         public static final class All implements BaseColumns {
 
             /**