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

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

Merge "Hide and disable emergency assist API" into mnc-dev

parents ffa8f101 46fa08d6

api/current.txt

+0 −1
Original line number Diff line number Diff line
@@ -31188,7 +31188,6 @@ 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

+0 −1
Original line number Diff line number Diff line
@@ -33442,7 +33442,6 @@ 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

telephony/java/android/telephony/TelephonyManager.java

+7 −0
Original line number Diff line number Diff line
@@ -264,11 +264,18 @@ public class TelephonyManager { 
    /**

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

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

     *

     * @hide

     */

    @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)

    public static final String ACTION_EMERGENCY_ASSISTANCE =

            "android.telephony.action.EMERGENCY_ASSISTANCE";



    /**

     * @hide

     */

    public static final boolean EMERGENCY_ASSISTANCE_ENABLED = false;



    /**

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

     * for a String containing the new call state.