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

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

Merge "Make it possible to dial an operator specific code" am: f4f4ba3d 

am: 6519e65e

Change-Id: Ic13742cb8e39beaf8ab722ac9203c22c5e5a83f8
parents f9ae47c5 6519e65e

telephony/java/android/telephony/CarrierConfigManager.java

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

            "skip_cf_fail_to_disable_dialog_bool";



    /**

     * List of the FAC (feature access codes) to dial as a normal call.

     * @hide

     */

    public static final String KEY_FEATURE_ACCESS_CODES_STRING_ARRAY =

            "feature_access_codes_string_array";



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

    private final static PersistableBundle sDefaults;
@@ -1889,6 +1896,7 @@ public class CarrierConfigManager { 
        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);

        sDefaults.putStringArray(KEY_FEATURE_ACCESS_CODES_STRING_ARRAY, null);

    }



    /**