Merge "Disable DUN APN while roaming for certain carriers" am: 4becee9740 am: 5b22a598c6

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1371059

Change-Id: I784712ead1cb4c47e5a436d8fe33655b51847879
This commit is contained in:
Treehugger Robot
2020-07-24 17:47:59 +00:00
committed by Automerger Merge Worker

View File

@@ -3863,6 +3863,15 @@ public class CarrierConfigManager {
public static final String KEY_MISSED_INCOMING_CALL_SMS_PATTERN_STRING_ARRAY = public static final String KEY_MISSED_INCOMING_CALL_SMS_PATTERN_STRING_ARRAY =
"missed_incoming_call_sms_pattern_string_array"; "missed_incoming_call_sms_pattern_string_array";
/**
* Indicating whether DUN APN should be disabled when the device is roaming. In that case,
* the default APN (i.e. internet) will be used for tethering.
*
* @hide
*/
public static final String KEY_DISABLE_DUN_APN_WHILE_ROAMING =
"disable_dun_apn_while_roaming";
/** The default value for every variable. */ /** The default value for every variable. */
private final static PersistableBundle sDefaults; private final static PersistableBundle sDefaults;
@@ -4398,6 +4407,7 @@ public class CarrierConfigManager {
"ims:2", "cbs:2", "ia:2", "emergency:2", "mcx:3", "xcap:3" "ims:2", "cbs:2", "ia:2", "emergency:2", "mcx:3", "xcap:3"
}); });
sDefaults.putStringArray(KEY_MISSED_INCOMING_CALL_SMS_PATTERN_STRING_ARRAY, new String[0]); sDefaults.putStringArray(KEY_MISSED_INCOMING_CALL_SMS_PATTERN_STRING_ARRAY, new String[0]);
sDefaults.putBoolean(KEY_DISABLE_DUN_APN_WHILE_ROAMING, false);
} }
/** /**