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

Merge "Rename KEY_AES_URL_STRING" into sc-dev

Browse Source
This commit is contained in:
Meng Wang
2021-02-26 19:06:21 +00:00
committed by Android (Google) Code Review
parent ce601122fa 0b9aeb4f48
commit b06c496db7
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/api/current.txt
View File

@@ -40440,7 +40440,7 @@ package android.telephony {
}
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_ENTITLEMENT_SERVER_URL_STRING = "imsserviceentitlement.entitlement_server_url_string";
field public static final String KEY_PREFIX = "imsserviceentitlement.";
}

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

@@ -3676,14 +3676,13 @@ public class CarrierConfigManager {
/** 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";
public static final String KEY_ENTITLEMENT_SERVER_URL_STRING =
KEY_PREFIX + "entitlement_server_url_string";
private static PersistableBundle getDefaults() {
PersistableBundle defaults = new PersistableBundle();
defaults.putString(KEY_AES_URL_STRING, "");
defaults.putString(KEY_ENTITLEMENT_SERVER_URL_STRING, "");
return defaults;
}
}