commit 46cf71d1d00f1ad26ac81e09c46b88c7c076243c
author Shuo Qian <shuoq@google.com> Fri Oct 04 15:50:43 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Oct 04 15:50:43 2019 +0000
tree a14cdf93ba9701009e66cb800af7719792ba29c5
parent d3ec7950e39813524df075d09568bede87c42663
parent 650ff647e4650862a5d451ff79a64684389da6c9

Merge "Add both Emergency Number listener for testing"

api/test-current.txt

diff --git a/api/test-current.txt b/api/test-current.txt
index dab0e7b1..e4da4cd 100644
--- a/api/test-current.txt
+++ b/api/test-current.txt
@@ -2862,6 +2862,8 @@
   }
 
   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
   }

telephony/java/android/telephony/PhoneStateListener.java

diff --git a/telephony/java/android/telephony/PhoneStateListener.java b/telephony/java/android/telephony/PhoneStateListener.java
index 2c4d59d1..35eec6d 100644
--- a/telephony/java/android/telephony/PhoneStateListener.java
+++ b/telephony/java/android/telephony/PhoneStateListener.java
@@ -878,6 +878,7 @@
      * @hide
      */
     @SystemApi
+    @TestApi
     public void onOutgoingEmergencyCall(@NonNull EmergencyNumber placedEmergencyNumber) {
         // default implementation empty
     }
@@ -889,6 +890,7 @@
      * @hide
      */
     @SystemApi
+    @TestApi
     public void onOutgoingEmergencySms(@NonNull EmergencyNumber sentEmergencyNumber) {
         // default implementation empty
     }