Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b06c496d authored by Meng Wang's avatar Meng Wang Committed by Android (Google) Code Review
Browse files

Merge "Rename KEY_AES_URL_STRING" into sc-dev

parents ce601122 0b9aeb4f

core/api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -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.";















  }







































telephony/java/android/telephony/CarrierConfigManager.java



+3
−4




























Original line number
Diff line number
Diff line








@@ -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;















        }















    }