commit 1859e648d618820a8f4debefd2b24facee520455
author Zoey Chen <zoeychen@google.com> Thu Mar 19 06:21:35 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Mar 19 06:21:35 2020 +0000
tree 636ce29e1323e1721c535275e133cc2c1419d0db
parent 28a33a26c2f8b2bde9f71868f52e628c8a648e3a
parent c73028e9f288f039fee85c07f6366ba860a632ca

Merge "[TelephonyMainline] @hide @SystemApi and revisit them in S. - CarrierColumns"

api/system-current.txt

diff --git a/api/system-current.txt b/api/system-current.txt
index 1eb70f0..f03af6b 100755
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -6897,32 +6897,6 @@
     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

core/java/android/provider/Telephony.java

diff --git a/core/java/android/provider/Telephony.java b/core/java/android/provider/Telephony.java
index b3e22bd..2217ee3 100644
--- a/core/java/android/provider/Telephony.java
+++ b/core/java/android/provider/Telephony.java
@@ -1365,7 +1365,6 @@
      * Base column for the table that contain Carrier Public key.
      * @hide
      */
-    @SystemApi
     public interface CarrierColumns extends BaseColumns {
 
         /**
@@ -4865,7 +4864,6 @@
          * Contains mappings between matching rules with carrier id for all carriers.
          * @hide
          */
-        @SystemApi
         public static final class All implements BaseColumns {
 
             /**