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

Merge changes from topic "move-emergency-phone-update" am: 77b5c5a31b am: 4c805f8ed6 am: 6ae0e0d498

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

Change-Id: I56e32d36ca7bca36bbc4d3d5a9eeb02f3c8344b3
This commit is contained in:
Hall Liu
2020-10-22 22:21:46 +00:00
committed by Automerger Merge Worker
parent a42a78e900 6ae0e0d498
commit edcb833692
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -924,18 +924,21 @@ public class PhoneStateListener {
/** /**
* Callback invoked when the current emergency number list has changed on the registered * Callback invoked when the current emergency number list has changed on the registered
* subscription. * subscription.
* Note, the registration subId comes from {@link TelephonyManager} object which registers *
* PhoneStateListener by {@link TelephonyManager#listen(PhoneStateListener, int)}. * Note, the registered subscription is associated with {@link TelephonyManager} object
* on which {@link TelephonyManager#listen(PhoneStateListener, int)} was called.
* If this TelephonyManager object was created with * If this TelephonyManager object was created with
* {@link TelephonyManager#createForSubscriptionId(int)}, then the callback applies to the * {@link TelephonyManager#createForSubscriptionId(int)}, then the callback applies to the
* subId. Otherwise, this callback applies to * given subId. Otherwise, this callback applies to
* {@link SubscriptionManager#getDefaultSubscriptionId()}. * {@link SubscriptionManager#getDefaultSubscriptionId()}.
* *
* @param emergencyNumberList Map including the key as the active subscription ID * @param emergencyNumberList Map associating all active subscriptions on the device with the
* (Note: if there is no active subscription, the key is * list of emergency numbers originating from that subscription.
* {@link SubscriptionManager#getDefaultSubscriptionId}) * If there are no active subscriptions, the map will contain a
* and the value as the list of {@link EmergencyNumber}; * single entry with
* null if this information is not available. * {@link SubscriptionManager#INVALID_SUBSCRIPTION_ID} as
* the key and a list of emergency numbers as the value. If no
* emergency number information is available, the value will be null.
*/ */
public void onEmergencyNumberListChanged( public void onEmergencyNumberListChanged(
@NonNull Map<Integer, List<EmergencyNumber>> emergencyNumberList) { @NonNull Map<Integer, List<EmergencyNumber>> emergencyNumberList) {