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

Merge "Add ImsServiceEntitlement Configs"

Browse Source
This commit is contained in:
Daniel Huang
2021-01-15 06:01:30 +00:00
committed by Android (Google) Code Review
parent 5ffd2a0d6e e600a8e4e8
commit f2e56d1f9f
2 changed files with 28 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/api/current.txt
View File

@@ -40182,6 +40182,11 @@ package android.telephony {
field public static final String KEY_WIFI_OFF_DEFERRING_TIME_MILLIS_INT = "ims.wifi_off_deferring_time_millis_int";
}
public static final class CarrierConfigManager.ImsServiceEntitlement {
field public static final String KEY_AES_URL_STRING = "imsserviceentitlement.aes_url_string";
field public static final String KEY_PREFIX = "imsserviceentitlement.";
}
public static final class CarrierConfigManager.Iwlan {
field public static final int AUTHENTICATION_METHOD_CERT = 1; // 0x1
field public static final int AUTHENTICATION_METHOD_EAP_ONLY = 0; // 0x0

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

@@ -3591,6 +3591,28 @@ public class CarrierConfigManager {
*/
public static final String ENABLE_EAP_METHOD_PREFIX_BOOL = "enable_eap_method_prefix_bool";
/**
* Configs used by ImsServiceEntitlement.
*/
public static final class ImsServiceEntitlement {
private ImsServiceEntitlement() {}
/** Prefix of all ImsServiceEntitlement.KEY_* constants. */
public static final String KEY_PREFIX = "imsserviceentitlement.";
/** The address of the entitlement configuration server. */
public static final String KEY_AES_URL_STRING = KEY_PREFIX + "aes_url_string";
private static PersistableBundle getDefaults() {
PersistableBundle defaults = new PersistableBundle();
defaults.putString(KEY_AES_URL_STRING, "");
return defaults;
}
}
/**
* GPS configs. See the GNSS HAL documentation for more details.
*/
@@ -5119,6 +5141,7 @@ public class CarrierConfigManager {
sDefaults.putLong(KEY_OPPORTUNISTIC_NETWORK_BACKOFF_TIME_LONG, 10000);
/* Default value is 60 seconds. */
sDefaults.putLong(KEY_OPPORTUNISTIC_NETWORK_MAX_BACKOFF_TIME_LONG, 60000);
sDefaults.putAll(ImsServiceEntitlement.getDefaults());
sDefaults.putAll(Gps.getDefaults());
sDefaults.putIntArray(KEY_CDMA_ENHANCED_ROAMING_INDICATOR_FOR_HOME_NETWORK_INT_ARRAY,
new int[] {