From 108cb12a6a8cc482ffee8e6329c283953d2994d6 Mon Sep 17 00:00:00 2001 From: sqian Date: Wed, 20 Mar 2019 14:16:14 -0700 Subject: 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 Merged-In: Ib9b96bb0a210aba64a8652984d22f3564813fa9d (cherry picked from commit 69f48c5e906512bf9ac56b315daa6d4dfdfb7600) --- api/current.txt | 1 + telephony/java/android/telephony/CarrierConfigManager.java | 13 +++++++++++++ 2 files changed, 14 insertions(+) diff --git a/api/current.txt b/api/current.txt index 0f7655c71931..36443b0c5316 100755 --- a/api/current.txt +++ b/api/current.txt @@ -42202,6 +42202,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 3454c1cbc14c..bafec5cd37fa 100755 --- a/telephony/java/android/telephony/CarrierConfigManager.java +++ b/telephony/java/android/telephony/CarrierConfigManager.java @@ -2454,6 +2454,18 @@ 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"; + /** * Determines whether the carrier wants to cancel the cs reject notification automatically * when the voice registration state changes. @@ -2884,6 +2896,7 @@ public class CarrierConfigManager { new int[] { 1 /* Roaming Indicator Off */ }); + sDefaults.putStringArray(KEY_EMERGENCY_NUMBER_PREFIX_STRING_ARRAY, new String[0]); sDefaults.putString(KEY_5G_ICON_CONFIGURATION_STRING, "connected_mmwave:None,connected:5G,not_restricted:None,restricted:None"); sDefaults.putBoolean(KEY_AUTO_CANCEL_CS_REJECT_NOTIFICATION, false); -- cgit v1.2.3-59-g8ed1b