From 81f2bbd4351eecc82cef62d58319ac2dd1bb96fe Mon Sep 17 00:00:00 2001 From: Daniel Bright Date: Tue, 24 Mar 2020 14:53:59 -0700 Subject: Add CarrierConfig key to customize apn priority clean cherry pick Test: atest on com.android.internal.telephony.dataconnection Test: Make phone call Test: Send text message Test: Hit websites on chrome Test: Override pririties using carrier config using broadcast Bug: 152324921 Merged-In: I259071334c135709fc98c989a9b7c8c35f449578 Merged-In: Ib2139a93768999c2a867e40fea8d86c0ce730130 Change-Id: Iaa0ef7d9e29e074c37abd9481c2cdd3e5ecc7cae --- .../java/android/telephony/CarrierConfigManager.java | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java index 5149ad232705..9e7f9d0c783b 100644 --- a/telephony/java/android/telephony/CarrierConfigManager.java +++ b/telephony/java/android/telephony/CarrierConfigManager.java @@ -3629,6 +3629,17 @@ public class CarrierConfigManager { public static final String KEY_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 * matching the missed incoming call's date, time, and caller id. The pattern should match @@ -4159,6 +4170,10 @@ public class CarrierConfigManager { sDefaults.putLong(KEY_DATA_SWITCH_VALIDATION_MIN_GAP_LONG, TimeUnit.DAYS.toMillis(1)); sDefaults.putStringArray(KEY_MISSED_INCOMING_CALL_SMS_ORIGINATOR_STRING_ARRAY, 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]); } -- cgit v1.2.3-59-g8ed1b