summaryrefslogtreecommitdiffstats
path: root/telephony/java/android/telephony
diff options
context:
space:
mode:
authorAmit Mahajan <amitmahajan@google.com>2016-01-14 06:26:26 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2016-01-14 06:26:26 +0000
commit658fdf8426e5c0fb68b7c04af651eae93a32b4b4 (patch)
tree69172f519b378fa37cfa25775a0380b3f22562e2 /telephony/java/android/telephony
parentd5cea64d8d63e9ffb61af1e669962de08ea513cc (diff)
parent7e8b8f1734f357a66f350703b2a651525d69e99f (diff)
downloadframeworks_base-658fdf8426e5c0fb68b7c04af651eae93a32b4b4.zip
frameworks_base-658fdf8426e5c0fb68b7c04af651eae93a32b4b4.tar.gz
frameworks_base-658fdf8426e5c0fb68b7c04af651eae93a32b4b4.tar.bz2
Merge "DO NOT MERGE Adding new intent for EMERGENCY_CALL_STATE_CHANGE" into mnc-dr1.5-dev
Diffstat (limited to 'telephony/java/android/telephony')
-rw-r--r--telephony/java/android/telephony/CarrierConfigManager.java8
1 files changed, 8 insertions, 0 deletions
diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java
index 7dee48b..e1deb98 100644
--- a/telephony/java/android/telephony/CarrierConfigManager.java
+++ b/telephony/java/android/telephony/CarrierConfigManager.java
@@ -458,6 +458,13 @@ public class CarrierConfigManager {
*/
public static final String KEY_ALLOW_ADDING_APNS_BOOL = "allow_adding_apns_bool";
+ /**
+ * Boolean indicating if intent for emergency call state changes should be broadcast
+ * @hide
+ */
+ public static final String KEY_BROADCAST_EMERGENCY_CALL_STATE_CHANGES_BOOL =
+ "broadcast_emergency_call_state_changes_bool";
+
// These variables are used by the MMS service and exposed through another API, {@link
// SmsManager}. The variable names and string values are copied from there.
public static final String KEY_MMS_ALIAS_ENABLED_BOOL = "aliasEnabled";
@@ -556,6 +563,7 @@ public class CarrierConfigManager {
sDefaults.putString(KEY_CI_ACTION_ON_SYS_UPDATE_EXTRA_VAL_STRING, "");
sDefaults.putBoolean(KEY_CSP_ENABLED_BOOL, false);
sDefaults.putBoolean(KEY_ALLOW_ADDING_APNS_BOOL, true);
+ sDefaults.putBoolean(KEY_BROADCAST_EMERGENCY_CALL_STATE_CHANGES_BOOL, false);
sDefaults.putBoolean(KEY_ALWAYS_SHOW_EMERGENCY_ALERT_ONOFF_BOOL, false);
sDefaults.putStringArray(KEY_GSM_ROAMING_NETWORKS_STRING_ARRAY, null);