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

Commit f0fee154 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Reannotate emergency broadcasts in TelephonyManager" into rvc-dev am:... 

Merge "Reannotate emergency broadcasts in TelephonyManager" into rvc-dev am: cd0a829c am: 13dc10bd am: 86bba6f3

Change-Id: I52515ca7b52ed07efa8d0302daf18d91cb057b34
parents cdd26349 86bba6f3

telephony/java/android/telephony/TelephonyManager.java

+2 −0
Original line number Diff line number Diff line
@@ -1565,6 +1565,7 @@ public class TelephonyManager { 
     * @hide

     */

    @SystemApi

    @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)

    @SuppressLint("ActionValue")

    public static final String ACTION_EMERGENCY_CALLBACK_MODE_CHANGED =

            "android.intent.action.EMERGENCY_CALLBACK_MODE_CHANGED";
@@ -1786,6 +1787,7 @@ public class TelephonyManager { 
     * @hide

     */

    @SystemApi

    @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)

    @SuppressLint("ActionValue")

    public static final String ACTION_EMERGENCY_CALL_STATE_CHANGED =

            "android.intent.action.EMERGENCY_CALL_STATE_CHANGED";