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

Commit a6f42854 authored by Adrian Roos's avatar Adrian Roos Committed by Android (Google) Code Review
Browse files

Merge "Add emergency assistance API and setting"

parents c889098e 943eb865

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -29795,6 +29795,7 @@ package android.telephony { 
    method public boolean setOperatorBrandOverride(java.lang.String);

    method public boolean setPreferredNetworkTypeToGlobal();

    method public boolean setVoiceMailNumber(java.lang.String, java.lang.String);

    field public static final java.lang.String ACTION_EMERGENCY_ASSISTANCE = "android.telephony.action.EMERGENCY_ASSISTANCE";

    field public static final java.lang.String ACTION_PHONE_STATE_CHANGED = "android.intent.action.PHONE_STATE";

    field public static final java.lang.String ACTION_RESPOND_VIA_MESSAGE = "android.intent.action.RESPOND_VIA_MESSAGE";

    field public static final int CALL_STATE_IDLE = 0; // 0x0

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -32229,6 +32229,7 @@ package android.telephony { 
    method public int[] supplyPukReportResult(java.lang.String, java.lang.String);

    method public void toggleRadioOnOff();

    method public void updateServiceLocation();

    field public static final java.lang.String ACTION_EMERGENCY_ASSISTANCE = "android.telephony.action.EMERGENCY_ASSISTANCE";

    field public static final java.lang.String ACTION_PHONE_STATE_CHANGED = "android.intent.action.PHONE_STATE";

    field public static final java.lang.String ACTION_RESPOND_VIA_MESSAGE = "android.intent.action.RESPOND_VIA_MESSAGE";

    field public static final int CALL_STATE_IDLE = 0; // 0x0

core/java/android/provider/Settings.java

+9 −0
Original line number Diff line number Diff line
@@ -5254,6 +5254,15 @@ public final class Settings { 
         */

        public static final String SMS_DEFAULT_APPLICATION = "sms_default_application";



        /**

         * Specifies the package name currently configured to be the emergency assistance application

         *

         * @see android.telephony.TelephonyManager#ACTION_EMERGENCY_ASSISTANCE

         *

         * @hide

         */

        public static final String EMERGENCY_ASSISTANCE_APPLICATION = "emergency_assistance_application";



        /**

         * Names of the packages that the current user has explicitly allowed to

         * see all of the user's notifications, separated by ':'.

telephony/java/android/telephony/TelephonyManager.java

+9 −1
Original line number Diff line number Diff line
@@ -258,10 +258,18 @@ public class TelephonyManager { 
     * <p>

     * Output: nothing.

     */

    @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)

    @SdkConstant(SdkConstantType.SERVICE_ACTION)

    public static final String ACTION_RESPOND_VIA_MESSAGE =

            "android.intent.action.RESPOND_VIA_MESSAGE";



    /**

     * The emergency dialer may choose to present activities with intent filters for this

     * action as emergency assistance buttons that launch the activity when clicked.

     */

    @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)

    public static final String ACTION_EMERGENCY_ASSISTANCE =

            "android.telephony.action.EMERGENCY_ASSISTANCE";



    /**

     * The lookup key used with the {@link #ACTION_PHONE_STATE_CHANGED} broadcast

     * for a String containing the new call state.