diff options
| author | 2019-10-04 09:39:50 -0700 | |
|---|---|---|
| committer | 2019-10-04 09:39:50 -0700 | |
| commit | 07ac796568d9c871b37e6f7c18af7d0c4073f50b (patch) | |
| tree | 0d42c8ec0a7990bec9297707effde9dfac43f3d0 | |
| parent | dca919d8d8927451a1d3cc3564b9691cea09dbb3 (diff) | |
| parent | bbcbf281d1c2612ee69135e0429396f166542a1f (diff) | |
Merge "Add both Emergency Number listener for testing" am: 46cf71d1d0 am: 69eabb2397
am: bbcbf281d1
Change-Id: I864072e7c077ab95fd5619bfbccf0b3bee54e225
| -rw-r--r-- | api/test-current.txt | 2 | ||||
| -rw-r--r-- | telephony/java/android/telephony/PhoneStateListener.java | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/api/test-current.txt b/api/test-current.txt index 08e3798ffe29..19b1d155c162 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -2864,6 +2864,8 @@ package android.telephony { } public class PhoneStateListener { + method public void onOutgoingEmergencyCall(@NonNull android.telephony.emergency.EmergencyNumber); + method public void onOutgoingEmergencySms(@NonNull android.telephony.emergency.EmergencyNumber); field @RequiresPermission("android.permission.READ_ACTIVE_EMERGENCY_SESSION") public static final int LISTEN_OUTGOING_CALL_EMERGENCY_NUMBER = 268435456; // 0x10000000 field @RequiresPermission("android.permission.READ_ACTIVE_EMERGENCY_SESSION") public static final int LISTEN_OUTGOING_SMS_EMERGENCY_NUMBER = 536870912; // 0x20000000 } diff --git a/telephony/java/android/telephony/PhoneStateListener.java b/telephony/java/android/telephony/PhoneStateListener.java index 2c4d59d18916..35eec6dd3cb3 100644 --- a/telephony/java/android/telephony/PhoneStateListener.java +++ b/telephony/java/android/telephony/PhoneStateListener.java @@ -878,6 +878,7 @@ public class PhoneStateListener { * @hide */ @SystemApi + @TestApi public void onOutgoingEmergencyCall(@NonNull EmergencyNumber placedEmergencyNumber) { // default implementation empty } @@ -889,6 +890,7 @@ public class PhoneStateListener { * @hide */ @SystemApi + @TestApi public void onOutgoingEmergencySms(@NonNull EmergencyNumber sentEmergencyNumber) { // default implementation empty } |