diff options
| author | 2019-12-13 21:47:01 +0000 | |
|---|---|---|
| committer | 2019-12-13 21:47:01 +0000 | |
| commit | 75332fe95e6430f8cb9d9d4428b64ca5cc1ab30d (patch) | |
| tree | b2c74f32872f95e17e2ed465b97581fbfa490ca6 | |
| parent | 5e8ec67b3e42ed0904f0df3bb2fd61a18a896d6a (diff) | |
| parent | 68a76f5c4c2c269fc3130ee1d7b8222840a8cd9d (diff) | |
Merge "Expose ACTION_EMERGENCY_ASSISTANCE as SystemAPi" am: ba4eb1d6b4 am: 68a76f5c4c
Change-Id: I3953180c29faba0bcc14c4c3f6a56a7455ec3a47
| -rwxr-xr-x | api/system-current.txt | 1 | ||||
| -rw-r--r-- | telephony/java/android/telephony/TelephonyManager.java | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/api/system-current.txt b/api/system-current.txt index 0e714d7f1875..13c9aaf9e248 100755 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -8949,6 +8949,7 @@ package android.telephony { method public void updateServiceLocation(); method @RequiresPermission(android.Manifest.permission.READ_ACTIVE_EMERGENCY_SESSION) public void updateTestOtaEmergencyNumberDbFilePath(@NonNull String); field @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public static final String ACTION_ANOMALY_REPORTED = "android.telephony.action.ANOMALY_REPORTED"; + field public static final String ACTION_EMERGENCY_ASSISTANCE = "android.telephony.action.EMERGENCY_ASSISTANCE"; field public static final String ACTION_SIM_APPLICATION_STATE_CHANGED = "android.telephony.action.SIM_APPLICATION_STATE_CHANGED"; field public static final String ACTION_SIM_CARD_STATE_CHANGED = "android.telephony.action.SIM_CARD_STATE_CHANGED"; field public static final String ACTION_SIM_SLOT_STATUS_CHANGED = "android.telephony.action.SIM_SLOT_STATUS_CHANGED"; diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java index 08890f47e901..f789d1930bf1 100644 --- a/telephony/java/android/telephony/TelephonyManager.java +++ b/telephony/java/android/telephony/TelephonyManager.java @@ -603,6 +603,7 @@ public class TelephonyManager { * * @hide */ + @SystemApi @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION) public static final String ACTION_EMERGENCY_ASSISTANCE = "android.telephony.action.EMERGENCY_ASSISTANCE"; |