From 0b9aeb4f48cecd5eaabff99b201385d423ea6efe Mon Sep 17 00:00:00 2001 From: danielwbhuang Date: Tue, 23 Feb 2021 15:22:42 +0800 Subject: [PATCH] Rename KEY_AES_URL_STRING The word "aes" is not clear enough to be understood. Rename KEY_AES_URL_STRING to KEY_ENTITLEMENT_SERVER_URL_STRING. BUG: 180945778 Test: presubmit Change-Id: Ia3d9841dc14f95b8d2d24787b6d68f7e2afcf154 --- core/api/current.txt | 2 +- telephony/java/android/telephony/CarrierConfigManager.java | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/core/api/current.txt b/core/api/current.txt index d1b9716b4cd38..95f4b2b857fe7 100644 --- a/core/api/current.txt +++ b/core/api/current.txt @@ -40329,7 +40329,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."; } diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java index 7215cd5e55593..aa0ef805bf22f 100644 --- a/telephony/java/android/telephony/CarrierConfigManager.java +++ b/telephony/java/android/telephony/CarrierConfigManager.java @@ -3666,14 +3666,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; } }