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

Commit 23be5ee3 authored by Jordan Liu's avatar Jordan Liu Committed by android-build-merger
Browse files

Merge "Add a new carrier config to suppress AoC indication" am: db95dff0 

am: c04d233a

Change-Id: Ic98c8f09bee42d8dba02c512b5543fb764105a92
parents 506f89a2 c04d233a

telephony/java/android/telephony/CarrierConfigManager.java

+8 −0
Original line number Diff line number Diff line
@@ -1563,6 +1563,13 @@ public class CarrierConfigManager { 
    public static final String KEY_SHOW_IMS_REGISTRATION_STATUS_BOOL =

            "show_ims_registration_status_bool";



    /**

     * The flag to disable the popup dialog which warns the user of data charges.

     * @hide

     */

    public static final String KEY_DISABLE_CHARGE_INDICATION_BOOL =

            "disable_charge_indication_bool";



    /** The default value for every variable. */

    private final static PersistableBundle sDefaults;
@@ -1830,6 +1837,7 @@ public class CarrierConfigManager { 
        sDefaults.putStringArray(KEY_NON_ROAMING_OPERATOR_STRING_ARRAY, null);

        sDefaults.putStringArray(KEY_ROAMING_OPERATOR_STRING_ARRAY, null);

        sDefaults.putBoolean(KEY_SHOW_IMS_REGISTRATION_STATUS_BOOL, false);

        sDefaults.putBoolean(KEY_DISABLE_CHARGE_INDICATION_BOOL, false);

    }



    /**