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

Call onOutgoingEmergencyCall only once. am: 486ef8978d

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1470382

Change-Id: I3c5a098b8f22b1a032e297205684dbe4617b6e39
This commit is contained in:
Hall Liu
2020-10-22 20:58:35 +00:00
committed by Automerger Merge Worker
parent f8e5b6fd6e 486ef8978d
commit 2c0e19cf79
1 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
core/java/android/telephony/PhoneStateListener.java
View File

@@ -948,10 +948,6 @@ public class PhoneStateListener {
* This method will be called when an emergency call is placed on any subscription (including * This method will be called when an emergency call is placed on any subscription (including
* the no-SIM case), regardless of which subscription this listener was registered on. * the no-SIM case), regardless of which subscription this listener was registered on.
* *
* This method is deprecated. Both this method and the new
* {@link #onOutgoingEmergencyCall(EmergencyNumber, int)} will be called when an outgoing
* emergency call is placed.
*
* @param placedEmergencyNumber The {@link EmergencyNumber} the emergency call was placed to. * @param placedEmergencyNumber The {@link EmergencyNumber} the emergency call was placed to.
* *
* @deprecated Use {@link #onOutgoingEmergencyCall(EmergencyNumber, int)}. * @deprecated Use {@link #onOutgoingEmergencyCall(EmergencyNumber, int)}.
@@ -969,22 +965,24 @@ public class PhoneStateListener {
* This method will be called when an emergency call is placed on any subscription (including * This method will be called when an emergency call is placed on any subscription (including
* the no-SIM case), regardless of which subscription this listener was registered on. * the no-SIM case), regardless of which subscription this listener was registered on.
* *
* Both this method and the deprecated {@link #onOutgoingEmergencyCall(EmergencyNumber)} will be * The default implementation of this method calls
* called when an outgoing emergency call is placed. You should only implement one of these * {@link #onOutgoingEmergencyCall(EmergencyNumber)} for backwards compatibility purposes. Do
* methods. * not call {@code super(...)} from within your implementation unless you want
* {@link #onOutgoingEmergencyCall(EmergencyNumber)} to be called as well.
* *
* @param placedEmergencyNumber The {@link EmergencyNumber} the emergency call was placed to. * @param placedEmergencyNumber The {@link EmergencyNumber} the emergency call was placed to.
* @param subscriptionId The subscription ID used to place the emergency call. If the * @param subscriptionId The subscription ID used to place the emergency call. If the
* emergency call was placed without a valid subscription (e.g. when there * emergency call was placed without a valid subscription (e.g. when there
* are no SIM cards in the device), this will be equal to * are no SIM cards in the device), this will be equal to
* {@link SubscriptionManager#INVALID_SUBSCRIPTION_ID}. * {@link SubscriptionManager#INVALID_SUBSCRIPTION_ID}.
*
* @hide * @hide
*/ */
@SystemApi @SystemApi
@TestApi @TestApi
public void onOutgoingEmergencyCall(@NonNull EmergencyNumber placedEmergencyNumber, public void onOutgoingEmergencyCall(@NonNull EmergencyNumber placedEmergencyNumber,
int subscriptionId) { int subscriptionId) {
// Default implementation for backwards compatibility
onOutgoingEmergencyCall(placedEmergencyNumber);
} }
/** /**
@@ -1369,10 +1367,6 @@ public class PhoneStateListener {
PhoneStateListener psl = mPhoneStateListenerWeakRef.get(); PhoneStateListener psl = mPhoneStateListenerWeakRef.get();
if (psl == null) return; if (psl == null) return;
Binder.withCleanCallingIdentity(
() -> mExecutor.execute(
() -> psl.onOutgoingEmergencyCall(placedEmergencyNumber)));
Binder.withCleanCallingIdentity( Binder.withCleanCallingIdentity(
() -> mExecutor.execute( () -> mExecutor.execute(
() -> psl.onOutgoingEmergencyCall(placedEmergencyNumber, () -> psl.onOutgoingEmergencyCall(placedEmergencyNumber,