Merge "Deprecate KEY_EDITABLE_TETHER_APN_BOOL." into oc-mr1-dev

This commit is contained in:
TreeHugger Robot
2017-08-02 18:09:41 +00:00
committed by Android (Google) Code Review

View File

@@ -1367,17 +1367,6 @@ public class CarrierConfigManager {
public static final String KEY_NOTIFY_INTERNATIONAL_CALL_ON_WFC_BOOL =
"notify_international_call_on_wfc_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";
/**
* An array containing custom call forwarding number prefixes that will be blocked while the
* device is reporting that it is roaming. By default, there are no custom call
@@ -1771,7 +1760,6 @@ public class CarrierConfigManager {
sDefaults.putBoolean(KEY_ALLOW_USSD_REQUESTS_VIA_TELEPHONY_MANAGER_BOOL, true);
sDefaults.putBoolean(KEY_SUPPORT_3GPP_CALL_FORWARDING_WHILE_ROAMING_BOOL, true);
sDefaults.putBoolean(KEY_NOTIFY_INTERNATIONAL_CALL_ON_WFC_BOOL, false);
sDefaults.putBoolean(KEY_EDITABLE_TETHER_APN_BOOL, false);
sDefaults.putStringArray(KEY_CALL_FORWARDING_BLOCKS_WHILE_ROAMING_STRING_ARRAY,
null);
sDefaults.putInt(KEY_LTE_EARFCNS_RSRP_BOOST_INT, 0);