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

Commit 5b7f382b authored by Jordan Liu's avatar Jordan Liu Committed by android-build-merger
Browse files

Merge "Add new key for carrier configuration version" am: 06dcff96 

am: a39793b2

Change-Id: I67b773ba0f0ed66d7512d01551e13fb597c286a8
parents b2d80c1a a39793b2

telephony/java/android/telephony/CarrierConfigManager.java

+10 −0
Original line number Diff line number Diff line
@@ -77,6 +77,15 @@ public class CarrierConfigManager { 
    // give it a default value in sDefaults. If you need to ship a per-network override in the

    // system image, that can be added in packages/apps/CarrierConfig.



    /**

     * Specifies a value that identifies the version of the carrier configuration that is

     * currently in use. This string is displayed on the UI.

     * The format of the string is not specified.

     * @hide

     */

    public static final String KEY_CARRIER_CONFIG_VERSION_STRING =

            "carrier_config_version_string";



    /**

     * This flag specifies whether VoLTE availability is based on provisioning. By default this is

     * false.
@@ -2328,6 +2337,7 @@ public class CarrierConfigManager { 


    static {

        sDefaults = new PersistableBundle();

        sDefaults.putString(KEY_CARRIER_CONFIG_VERSION_STRING, "");

        sDefaults.putBoolean(KEY_ALLOW_HOLD_IN_IMS_CALL_BOOL, true);

        sDefaults.putBoolean(KEY_CARRIER_ALLOW_DEFLECT_IMS_CALL_BOOL, false);

        sDefaults.putBoolean(KEY_ALWAYS_PLAY_REMOTE_HOLD_TONE_BOOL, false);