diff options
| -rw-r--r-- | core/java/android/provider/Telephony.java | 24 | ||||
| -rw-r--r-- | telephony/java/android/telephony/ImsiEncryptionInfo.java | 18 |
2 files changed, 19 insertions, 23 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 diff --git a/telephony/java/android/telephony/ImsiEncryptionInfo.java b/telephony/java/android/telephony/ImsiEncryptionInfo.java index 4978692d3964..82333a46914b 100644 --- a/telephony/java/android/telephony/ImsiEncryptionInfo.java +++ b/telephony/java/android/telephony/ImsiEncryptionInfo.java @@ -46,16 +46,17 @@ public final class ImsiEncryptionInfo implements Parcelable { private final int keyType; //Date-Time in UTC when the key will expire. private final Date expirationTime; + private final int carrierId; /** @hide */ public ImsiEncryptionInfo(String mcc, String mnc, int keyType, String keyIdentifier, - byte[] key, Date expirationTime) { - this(mcc, mnc, keyType, keyIdentifier, makeKeyObject(key), expirationTime); + byte[] key, Date expirationTime, int carrierId) { + this(mcc, mnc, keyType, keyIdentifier, makeKeyObject(key), expirationTime, carrierId); } /** @hide */ public ImsiEncryptionInfo(String mcc, String mnc, int keyType, String keyIdentifier, - PublicKey publicKey, Date expirationTime) { + PublicKey publicKey, Date expirationTime, int carrierId) { // todo need to validate that ImsiEncryptionInfo is being created with the correct params. // Including validating that the public key is in "X.509" format. This will be done in // a subsequent CL. @@ -65,6 +66,7 @@ public final class ImsiEncryptionInfo implements Parcelable { this.publicKey = publicKey; this.keyIdentifier = keyIdentifier; this.expirationTime = expirationTime; + this.carrierId = carrierId; } /** @hide */ @@ -78,6 +80,7 @@ public final class ImsiEncryptionInfo implements Parcelable { keyIdentifier = in.readString(); keyType = in.readInt(); expirationTime = new Date(in.readLong()); + carrierId = in.readInt(); } /** @hide */ @@ -90,6 +93,11 @@ public final class ImsiEncryptionInfo implements Parcelable { return this.mcc; } + /** @hide */ + public int getCarrierId() { + return carrierId; + } + /** * Returns key identifier, a string that helps the authentication server to locate the * private key to decrypt the permanent identity, or {@code null} when uavailable. @@ -157,6 +165,7 @@ public final class ImsiEncryptionInfo implements Parcelable { dest.writeString(keyIdentifier); dest.writeInt(keyType); dest.writeLong(expirationTime.getTime()); + dest.writeInt(carrierId); } @Override @@ -164,10 +173,11 @@ public final class ImsiEncryptionInfo implements Parcelable { return "[ImsiEncryptionInfo " + "mcc=" + mcc + " mnc=" + mnc - + " publicKey=" + publicKey + + ", publicKey=" + publicKey + ", keyIdentifier=" + keyIdentifier + ", keyType=" + keyType + ", expirationTime=" + expirationTime + + ", carrier_id=" + carrierId + "]"; } } |