diff options
author | Amit Mahajan <amitmahajan@google.com> | 2016-01-12 18:25:33 -0800 |
---|---|---|
committer | Amit Mahajan <amitmahajan@google.com> | 2016-01-14 01:59:55 +0000 |
commit | 7e8b8f1734f357a66f350703b2a651525d69e99f (patch) | |
tree | dd495faa0bc1ad98f6a42e51cc2a31b8d5a4f79c /telephony | |
parent | fd87e92a42b659be5b120c59d9413d41e94b6753 (diff) | |
download | frameworks_base-7e8b8f1734f357a66f350703b2a651525d69e99f.zip frameworks_base-7e8b8f1734f357a66f350703b2a651525d69e99f.tar.gz frameworks_base-7e8b8f1734f357a66f350703b2a651525d69e99f.tar.bz2 |
DO NOT MERGE Adding new intent for EMERGENCY_CALL_STATE_CHANGE
Bug: 24147407
Change-Id: Ida957b9cc6b9c3e13bc8660213ce5cf979c886d5
Diffstat (limited to 'telephony')
3 files changed, 43 insertions, 11 deletions
diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java index eda71e8..c2f7471 100644 --- a/telephony/java/android/telephony/CarrierConfigManager.java +++ b/telephony/java/android/telephony/CarrierConfigManager.java @@ -449,6 +449,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"; @@ -547,6 +554,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); diff --git a/telephony/java/com/android/internal/telephony/PhoneConstants.java b/telephony/java/com/android/internal/telephony/PhoneConstants.java index 572cc6f..8bc1402 100644 --- a/telephony/java/com/android/internal/telephony/PhoneConstants.java +++ b/telephony/java/com/android/internal/telephony/PhoneConstants.java @@ -35,17 +35,17 @@ public class PhoneConstants { IDLE, RINGING, OFFHOOK; }; - /** - * The state of a data connection. - * <ul> - * <li>CONNECTED = IP traffic should be available</li> - * <li>CONNECTING = Currently setting up data connection</li> - * <li>DISCONNECTED = IP not available</li> - * <li>SUSPENDED = connection is created but IP traffic is - * temperately not available. i.e. voice call is in place - * in 2G network</li> - * </ul> - */ + /** + * The state of a data connection. + * <ul> + * <li>CONNECTED = IP traffic should be available</li> + * <li>CONNECTING = Currently setting up data connection</li> + * <li>DISCONNECTED = IP not available</li> + * <li>SUSPENDED = connection is created but IP traffic is + * temperately not available. i.e. voice call is in place + * in 2G network</li> + * </ul> + */ public enum DataState { CONNECTED, CONNECTING, DISCONNECTED, SUSPENDED; }; @@ -86,6 +86,7 @@ public class PhoneConstants { public static final String NETWORK_UNAVAILABLE_KEY = "networkUnvailable"; public static final String DATA_NETWORK_ROAMING_KEY = "networkRoaming"; public static final String PHONE_IN_ECM_STATE = "phoneinECMState"; + public static final String PHONE_IN_EMERGENCY_CALL = "phoneInEmergencyCall"; public static final String REASON_LINK_PROPERTIES_CHANGED = "linkPropertiesChanged"; diff --git a/telephony/java/com/android/internal/telephony/TelephonyIntents.java b/telephony/java/com/android/internal/telephony/TelephonyIntents.java index f563839..77b8a67 100644 --- a/telephony/java/com/android/internal/telephony/TelephonyIntents.java +++ b/telephony/java/com/android/internal/telephony/TelephonyIntents.java @@ -75,6 +75,7 @@ public class TelephonyIntents { */ public static final String ACTION_RADIO_TECHNOLOGY_CHANGED = "android.intent.action.RADIO_TECHNOLOGY"; + /** * <p>Broadcast Action: The emergency callback mode is changed. * <ul> @@ -94,6 +95,28 @@ public class TelephonyIntents { */ public static final String ACTION_EMERGENCY_CALLBACK_MODE_CHANGED = "android.intent.action.EMERGENCY_CALLBACK_MODE_CHANGED"; + + /** + * <p>Broadcast Action: The emergency call state is changed. + * <ul> + * <li><em>phoneInEmergencyCall</em> - A boolean value, true if phone in emergency call, + * false otherwise</li> + * </ul> + * <p class="note"> + * You can <em>not</em> receive this through components declared + * in manifests, only by explicitly registering for it with + * {@link android.content.Context#registerReceiver(android.content.BroadcastReceiver, + * android.content.IntentFilter) Context.registerReceiver()}. + * + * <p class="note"> + * Requires no permission. + * + * <p class="note">This is a protected intent that can only be sent + * by the system. + */ + public static final String ACTION_EMERGENCY_CALL_STATE_CHANGED + = "android.intent.action.EMERGENCY_CALL_STATE_CHANGED"; + /** * Broadcast Action: The phone's signal strength has changed. The intent will have the * following extra values:</p> |