Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add both Emergency Number listener for testing" am: 46cf71d1d0

Browse Source 
am: 69eabb2397

Change-Id: Id59600306c8b99dbf7a76c6a46ee16a3454368e0
This commit is contained in:
Shuo Qian
2019-10-04 09:24:59 -07:00
committed by android-build-merger
parent 3797fd2b58 69eabb2397
commit bbcbf281d1
2 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/test-current.txt
View File

@@ -2863,6 +2863,8 @@ package android.telephony {
} }
public class PhoneStateListener { 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_CALL_EMERGENCY_NUMBER = 268435456; // 0x10000000
field @RequiresPermission("android.permission.READ_ACTIVE_EMERGENCY_SESSION") public static final int LISTEN_OUTGOING_SMS_EMERGENCY_NUMBER = 536870912; // 0x20000000 field @RequiresPermission("android.permission.READ_ACTIVE_EMERGENCY_SESSION") public static final int LISTEN_OUTGOING_SMS_EMERGENCY_NUMBER = 536870912; // 0x20000000
} }

2
telephony/java/android/telephony/PhoneStateListener.java
View File

@@ -878,6 +878,7 @@ public class PhoneStateListener {
* @hide * @hide
*/ */
@SystemApi @SystemApi
@TestApi
public void onOutgoingEmergencyCall(@NonNull EmergencyNumber placedEmergencyNumber) { public void onOutgoingEmergencyCall(@NonNull EmergencyNumber placedEmergencyNumber) {
// default implementation empty // default implementation empty
} }
@@ -889,6 +890,7 @@ public class PhoneStateListener {
* @hide * @hide
*/ */
@SystemApi @SystemApi
@TestApi
public void onOutgoingEmergencySms(@NonNull EmergencyNumber sentEmergencyNumber) { public void onOutgoingEmergencySms(@NonNull EmergencyNumber sentEmergencyNumber) {
// default implementation empty // default implementation empty
} }