From 69f48c5e906512bf9ac56b315daa6d4dfdfb7600 Mon Sep 17 00:00:00 2001 From: sqian Date: Fri, 15 Feb 2019 16:19:36 -0800 Subject: [PATCH] Add Prefix per Carrier requirement Some carrier requires if users dial an emergency number address with some prefix, the combination of the prefix and the address is also a valid emergency number to dial. Bug: 122429213 Test: Treehugger Change-Id: Ib9b96bb0a210aba64a8652984d22f3564813fa9d --- api/current.txt | 1 + .../java/android/telephony/CarrierConfigManager.java | 12 ++++++++++++ 2 files changed, 13 insertions(+) diff --git a/api/current.txt b/api/current.txt index 15c4fdfed1780..c21d0b8a7093c 100644 --- a/api/current.txt +++ b/api/current.txt @@ -44258,6 +44258,7 @@ package android.telephony { field public static final String KEY_EDITABLE_ENHANCED_4G_LTE_BOOL = "editable_enhanced_4g_lte_bool"; field public static final String KEY_EDITABLE_VOICEMAIL_NUMBER_BOOL = "editable_voicemail_number_bool"; field public static final String KEY_EDITABLE_VOICEMAIL_NUMBER_SETTING_BOOL = "editable_voicemail_number_setting_bool"; + field public static final String KEY_EMERGENCY_NUMBER_PREFIX_STRING_ARRAY = "emergency_number_prefix_string_array"; field public static final String KEY_ENABLE_DIALER_KEY_VIBRATION_BOOL = "enable_dialer_key_vibration_bool"; field public static final String KEY_ENHANCED_4G_LTE_ON_BY_DEFAULT_BOOL = "enhanced_4g_lte_on_by_default_bool"; field public static final String KEY_FORCE_HOME_NETWORK_BOOL = "force_home_network_bool"; diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java index 1b7228ae9a334..ad98e36767330 100644 --- a/telephony/java/android/telephony/CarrierConfigManager.java +++ b/telephony/java/android/telephony/CarrierConfigManager.java @@ -2480,6 +2480,17 @@ public class CarrierConfigManager { public static final String KEY_OPPORTUNISTIC_NETWORK_DATA_SWITCH_HYSTERESIS_TIME_LONG = "opportunistic_network_data_switch_hysteresis_time_long"; + /** + * Indicates zero or more emergency number prefix(es), because some carrier requires + * if users dial an emergency number address with a specific prefix, the combination of the + * prefix and the address is also a valid emergency number to dial. For example, an emergency + * number prefix is 318, and the emergency number is 911. Both 318911 and 911 can be dialed by + * users for emergency call. An empty array of string indicates that current carrier does not + * have this requirement. + */ + public static final String KEY_EMERGENCY_NUMBER_PREFIX_STRING_ARRAY = + "emergency_number_prefix_string_array"; + /** * GPS configs. See android.hardware.gnss@1.0 IGnssConfiguration. * @hide @@ -2989,6 +3000,7 @@ public class CarrierConfigManager { new int[] { 1 /* Roaming Indicator Off */ }); + sDefaults.putStringArray(KEY_EMERGENCY_NUMBER_PREFIX_STRING_ARRAY, new String[0]); } /**