summaryrefslogtreecommitdiff
path: root/core/java/android
diff options
context:
space:
mode:
authorJayachandran C <jayachandranc@google.com>2022-03-21 17:05:19 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2022-03-21 17:05:19 +0000
commitc2e89bd300217e316cb51dfbbc281b65c0b39ec8 (patch)
treee72f837b231c3b3ff7f8a409d7d34969d5cc0605 /core/java/android
parent1c631a92ab910a8fe6a0a3a2f6adbcdb75904e57 (diff)
parentb838a7528769c7ee8e73be797abb629e13ef70c0 (diff)
Merge "Added carrier_id support to the carrier_key table in CarrierInformation DB"
Diffstat (limited to 'core/java/android')
-rw-r--r--core/java/android/provider/Telephony.java24
1 files changed, 5 insertions, 19 deletions
diff --git a/core/java/android/provider/Telephony.java b/core/java/android/provider/Telephony.java
index 0d5ef34c6f76..5b59b2120e19 100644
--- a/core/java/android/provider/Telephony.java
+++ b/core/java/android/provider/Telephony.java
@@ -1425,25 +1425,6 @@ public final class Telephony {
public static final String KEY_TYPE = "key_type";
/**
- * MVNO type:
- * {@code SPN (Service Provider Name), IMSI, GID (Group Identifier Level 1)}.
- * <P> Type: TEXT </P>
- */
- public static final String MVNO_TYPE = "mvno_type";
-
- /**
- * MVNO data.
- * Use the following examples.
- * <ul>
- * <li>SPN: A MOBILE, BEN NL, ...</li>
- * <li>IMSI: 302720x94, 2060188, ...</li>
- * <li>GID: 4E, 33, ...</li>
- * </ul>
- * <P> Type: TEXT </P>
- */
- public static final String MVNO_MATCH_DATA = "mvno_match_data";
-
- /**
* The carrier public key that is used for the IMSI encryption.
* <P> Type: TEXT </P>
*/
@@ -1470,6 +1451,11 @@ public final class Telephony {
public static final String LAST_MODIFIED = "last_modified";
/**
+ * Carrier ID of the operetor.
+ * <P> Type: TEXT </P>
+ */
+ public static final String CARRIER_ID = "carrier_id";
+ /**
* The {@code content://} style URL for this table.
*/
@NonNull