Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Change-Id: I4a04fa29390432ce5c25b7893665b3c8b21cf5ed
This commit is contained in:
Automerger Merge Worker
2020-03-17 01:30:11 +00:00
parent 4b5f18b9e2 cd0a829c49
commit 13dc10bdcb
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
telephony/java/android/telephony/TelephonyManager.java
View File

@@ -1565,6 +1565,7 @@ public class TelephonyManager {
* @hide * @hide
*/ */
@SystemApi @SystemApi
@SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)
@SuppressLint("ActionValue") @SuppressLint("ActionValue")
public static final String ACTION_EMERGENCY_CALLBACK_MODE_CHANGED = public static final String ACTION_EMERGENCY_CALLBACK_MODE_CHANGED =
"android.intent.action.EMERGENCY_CALLBACK_MODE_CHANGED"; "android.intent.action.EMERGENCY_CALLBACK_MODE_CHANGED";
@@ -1786,6 +1787,7 @@ public class TelephonyManager {
* @hide * @hide
*/ */
@SystemApi @SystemApi
@SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)
@SuppressLint("ActionValue") @SuppressLint("ActionValue")
public static final String ACTION_EMERGENCY_CALL_STATE_CHANGED = public static final String ACTION_EMERGENCY_CALL_STATE_CHANGED =
"android.intent.action.EMERGENCY_CALL_STATE_CHANGED"; "android.intent.action.EMERGENCY_CALL_STATE_CHANGED";