Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add CarrierConfig key to customize apn priority" into rvc-dev am: 2a639e9786 am: 6934c5ad1f

Browse Source 
Change-Id: I3203361d2e3262e2abbca2570e217ae10a2658a1
This commit is contained in:
Daniel Bright
2020-04-11 05:35:33 +00:00
committed by Automerger Merge Worker
parent 761952f790 6934c5ad1f
commit 8e4488c033
1 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
telephony/java/android/telephony/CarrierConfigManager.java
View File

@@ -3647,6 +3647,17 @@ public class CarrierConfigManager {
public static final String KEY_MISSED_INCOMING_CALL_SMS_ORIGINATOR_STRING_ARRAY = public static final String KEY_MISSED_INCOMING_CALL_SMS_ORIGINATOR_STRING_ARRAY =
"missed_incoming_call_sms_originator_string_array"; "missed_incoming_call_sms_originator_string_array";
/**
* String array of Apn Type configurations.
* The entries should be of form "APN_TYPE_NAME:priority".
* priority is an integer that is sorted from highest to lowest.
* example: cbs:5
*
* @hide
*/
public static final String KEY_APN_PRIORITY_STRING_ARRAY = "apn_priority_string_array";
/** /**
* The patterns of missed incoming call sms. This is the regular expression used for * The patterns of missed incoming call sms. This is the regular expression used for
* matching the missed incoming call's date, time, and caller id. The pattern should match * matching the missed incoming call's date, time, and caller id. The pattern should match
@@ -4179,6 +4190,10 @@ public class CarrierConfigManager {
sDefaults.putLong(KEY_DATA_SWITCH_VALIDATION_MIN_GAP_LONG, TimeUnit.DAYS.toMillis(1)); sDefaults.putLong(KEY_DATA_SWITCH_VALIDATION_MIN_GAP_LONG, TimeUnit.DAYS.toMillis(1));
sDefaults.putStringArray(KEY_MISSED_INCOMING_CALL_SMS_ORIGINATOR_STRING_ARRAY, sDefaults.putStringArray(KEY_MISSED_INCOMING_CALL_SMS_ORIGINATOR_STRING_ARRAY,
new String[0]); new String[0]);
sDefaults.putStringArray(KEY_APN_PRIORITY_STRING_ARRAY, new String[] {
"default:0", "mms:2", "supl:2", "dun:2", "hipri:3", "fota:2",
"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]);
} }