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

Merge "Fix the red build." into oc-dr1-dev-plus-aosp

Browse Source
This commit is contained in:
Pankaj Kanwar
2017-06-26 18:30:11 +00:00
committed by Android (Google) Code Review
parent 74ad86eec7 a2790a13fd
commit 4e5e0fe078
1 changed files with 0 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
telephony/java/android/telephony/CarrierConfigManager.java
View File

@@ -1454,23 +1454,6 @@ public class CarrierConfigManager {
public static final String KEY_DISABLE_VOICE_BARRING_NOTIFICATION_BOOL =
"disable_voice_barring_notification_bool";
/**
* URL from which the proto containing the public key of the Carrier used for
* IMSI encryption will be downloaded.
* @hide
*/
public static final String IMSI_KEY_DOWNLOAD_URL_STRING = "imsi_key_download_url_string";
/**
* Time in days, after which the key will expire, and a new key will need to be downloaded.
* default value is {@link IMSI_ENCRYPTION_DAYS_TIME_DISABLED}, and indicates that IMSI
* encryption is not enabled by default for a carrier. Value of 0 indicates that the key
* does not expire.
* @hide
*/
public static final String IMSI_KEY_EXPIRATION_DAYS_TIME_INT =
"imsi_key_expiration_days_time_int";
/**
* List of operators considered non-roaming which won't show roaming icon.
* <p>