Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Zoey Chen
2020-03-19 06:21:35 +00:00
committed by Gerrit Code Review
parent 28a33a26c2 c73028e9f2
commit 1859e648d6
2 changed files with 0 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
api/system-current.txt
View File

@@ -6897,32 +6897,6 @@ package android.provider {
field public static final int VOLUME_HUSH_VIBRATE = 1; // 0x1 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 { 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 String APN_SET_ID = "apn_set_id";
field public static final int CARRIER_EDITED = 4; // 0x4 field public static final int CARRIER_EDITED = 4; // 0x4

2
core/java/android/provider/Telephony.java
View File

@@ -1365,7 +1365,6 @@ public final class Telephony {
* Base column for the table that contain Carrier Public key. * Base column for the table that contain Carrier Public key.
* @hide * @hide
*/ */
@SystemApi
public interface CarrierColumns extends BaseColumns { public interface CarrierColumns extends BaseColumns {
/** /**
@@ -4865,7 +4864,6 @@ public final class Telephony {
* Contains mappings between matching rules with carrier id for all carriers. * Contains mappings between matching rules with carrier id for all carriers.
* @hide * @hide
*/ */
@SystemApi
public static final class All implements BaseColumns { public static final class All implements BaseColumns {
/** /**