diff options
| author | Hall Liu <hallliu@google.com> | 2020-08-05 17:34:49 -0700 |
|---|---|---|
| committer | Hall Liu <hallliu@google.com> | 2020-10-21 16:07:04 -0700 |
| commit | e182543791d6af99ae47cb7c2889737f856f37e4 (patch) | |
| tree | e7dc24b5f964445389aca1de7bd1fe7ace9e90d2 /api | |
| parent | 9caec7855727db80524ca759dcd24fe75acc64f9 (diff) | |
Expose onEmergencyNumberListChanged, semantics change
Expose the onEmergencyNumberListChanged method, which seems to have been
left hidden inadvertently when introduced.
Add a new version of onOutgoingEmergencyCall that supplies a
subscription ID and deprecate the old one. Along with this, send
emergency call events from any subscription to all listeners regardless
of which subscription the listener specified.
Test: atest CtsTelecomTestCases:OutgoingCallTest
Bug: 162647577
bug: 165660452
Change-Id: Ia0e10bfb3376ff82d03a6dbc4bf71c22b0ace366
Merged-In: Ia0e10bfb3376ff82d03a6dbc4bf71c22b0ace366
Diffstat (limited to 'api')
| -rw-r--r-- | api/current.txt | 1 | ||||
| -rwxr-xr-x | api/system-current.txt | 3 | ||||
| -rw-r--r-- | api/test-current.txt | 4 |
3 files changed, 7 insertions, 1 deletions
diff --git a/api/current.txt b/api/current.txt index 90c0eab439c4..b251612cbfdf 100644 --- a/api/current.txt +++ b/api/current.txt @@ -47801,6 +47801,7 @@ package android.telephony { method public void onDataConnectionStateChanged(int); method public void onDataConnectionStateChanged(int, int); method @RequiresPermission("android.permission.READ_PHONE_STATE") public void onDisplayInfoChanged(@NonNull android.telephony.TelephonyDisplayInfo); + method public void onEmergencyNumberListChanged(@NonNull java.util.Map<java.lang.Integer,java.util.List<android.telephony.emergency.EmergencyNumber>>); method @RequiresPermission("android.permission.READ_PRECISE_PHONE_STATE") public void onImsCallDisconnectCauseChanged(@NonNull android.telephony.ims.ImsReasonInfo); method public void onMessageWaitingIndicatorChanged(boolean); method @RequiresPermission("android.permission.MODIFY_PHONE_STATE") public void onPreciseDataConnectionStateChanged(@NonNull android.telephony.PreciseDataConnectionState); diff --git a/api/system-current.txt b/api/system-current.txt index 11b2828e6247..e586d75d70ad 100755 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -10814,7 +10814,8 @@ package android.telephony { public class PhoneStateListener { method public void onCallAttributesChanged(@NonNull android.telephony.CallAttributes); - method public void onOutgoingEmergencyCall(@NonNull android.telephony.emergency.EmergencyNumber); + method @Deprecated public void onOutgoingEmergencyCall(@NonNull android.telephony.emergency.EmergencyNumber); + method public void onOutgoingEmergencyCall(@NonNull android.telephony.emergency.EmergencyNumber, int); method public void onOutgoingEmergencySms(@NonNull android.telephony.emergency.EmergencyNumber); method @RequiresPermission("android.permission.READ_PRECISE_PHONE_STATE") public void onPreciseCallStateChanged(@NonNull android.telephony.PreciseCallState); method public void onRadioPowerStateChanged(int); diff --git a/api/test-current.txt b/api/test-current.txt index bdf797e80ccc..0cabd6f9ef38 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -1627,6 +1627,10 @@ package android.telephony { method public static void setMinMatchForTest(int); } + public class PhoneStateListener { + method public void onOutgoingEmergencyCall(@NonNull android.telephony.emergency.EmergencyNumber, int); + } + public final class PreciseDataConnectionState implements android.os.Parcelable { ctor @Deprecated public PreciseDataConnectionState(int, int, int, @NonNull String, @Nullable android.net.LinkProperties, int); } |