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

Commit f1adc1db authored by Junda Liu's avatar Junda Liu
Browse files

resolve merge conflicts of 0c62aa5f to master 

Change-Id: Ie032d5ab4ec0f1c038adfc5a0d506efe7a9248f0
parents a1b19a2c 0c62aa5f

telephony/java/android/telephony/CarrierConfigManager.java

+12 −0
Original line number Diff line number Diff line
@@ -1154,6 +1154,17 @@ public class CarrierConfigManager { 
    public static final String KEY_SUPPORT_3GPP_CALL_FORWARDING_WHILE_ROAMING_BOOL =

        "support_3gpp_call_forwarding_while_roaming_bool";



    /**

     * Determine whether user edited tether APN (type dun) has effect

     * {@code false} - Default. APN with dun type in telephony database has no effect.

     *

     * {@code true}  - DUN APN added/edited in ApnEditor will be used for tethering data call.

     *

     * @hide

     */

    public static final String KEY_EDITABLE_TETHER_APN_BOOL =

            "editable_tether_apn_bool";



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

    private final static PersistableBundle sDefaults;
@@ -1358,6 +1369,7 @@ public class CarrierConfigManager { 
        sDefaults.putStringArray(KEY_CARRIER_WIFI_STRING_ARRAY, null);

        sDefaults.putInt(KEY_PREF_NETWORK_NOTIFICATION_DELAY_INT, -1);

        sDefaults.putBoolean(KEY_SUPPORT_3GPP_CALL_FORWARDING_WHILE_ROAMING_BOOL, true);

        sDefaults.putBoolean(KEY_EDITABLE_TETHER_APN_BOOL, false);

    }



    /**