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

Commit 907585c0 authored by Robert Greenwalt's avatar Robert Greenwalt Committed by android-build-merger
Browse files

Merge "Add support for FDN contact dial" am: 082b1186 am: 24dea103 

am: 503d8fbb

Change-Id: I9642ea2e9a97d3fd72e9fdccc64f20c94a938088
parents b5571b1a 503d8fbb

telephony/java/android/telephony/CarrierConfigManager.java

+8 −0
Original line number Diff line number Diff line
@@ -940,6 +940,13 @@ public class CarrierConfigManager { 
    public static final int CDMA_ROAMING_MODE_AFFILIATED = 1;

    /** @hide */

    public static final int CDMA_ROAMING_MODE_ANY = 2;

    /**

     * Boolean indicating if support is provided for directly dialing FDN number from FDN list.

     * If false, this feature is not supported.

     * @hide

     */

    public static final String KEY_SUPPORT_DIRECT_FDN_DIALING_BOOL =

            "support_direct_fdn_dialing_bool";



    /**

     * Report IMEI as device id even if it's a CDMA/LTE phone.
@@ -1260,6 +1267,7 @@ public class CarrierConfigManager { 
        sDefaults.putBoolean(KEY_CONFIG_WIFI_DISABLE_IN_ECBM, false);

        sDefaults.putBoolean(KEY_CARRIER_NAME_OVERRIDE_BOOL, false);

        sDefaults.putString(KEY_CARRIER_NAME_STRING, "");

        sDefaults.putBoolean(KEY_SUPPORT_DIRECT_FDN_DIALING_BOOL, false);



        // MMS defaults

        sDefaults.putBoolean(KEY_MMS_ALIAS_ENABLED_BOOL, false);