Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 49442a1d authored by Amit Mahajan's avatar Amit Mahajan Committed by Android Partner Code Review
Browse files

Merge "Adding new intent for EMERGENCY_CALL_STATE_CHANGE" into mm-wireless-dev

parents 6fb0756d 0c081483

telephony/java/android/telephony/CarrierConfigManager.java

+8 −0
Original line number Diff line number Diff line
@@ -456,6 +456,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";
@@ -579,6 +586,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);

telephony/java/com/android/internal/telephony/PhoneConstants.java

+12 −11
Original line number Diff line number Diff line
@@ -89,6 +89,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";

telephony/java/com/android/internal/telephony/TelephonyIntents.java

+23 −0
Original line number Diff line number Diff line
@@ -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>