Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 69657278 authored by Shuo Qian's avatar Shuo Qian Committed by android-build-merger
Browse files

Merge "Add both Emergency Number listener for testing" am: 46cf71d1 am: 69eabb23 am: bbcbf281 

am: 07ac7965

Change-Id: I82b84cd3d74269fa3e381ff8d0c43a23fb061ea8
parents 05c78336 07ac7965

api/test-current.txt

+2 −0
Original line number Diff line number Diff line
@@ -2901,6 +2901,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

  }

telephony/java/android/telephony/PhoneStateListener.java

+2 −0
Original line number Diff line number Diff line
@@ -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

    }