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 am: 13dc10bdcb am: 86bba6f371

Browse Source 
Change-Id: I52515ca7b52ed07efa8d0302daf18d91cb057b34
This commit is contained in:
Automerger Merge Worker
2020-03-17 02:03:50 +00:00
parent cdd2634918 86bba6f371
commit f0fee1543d
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
*/
@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";