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

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

Merge "Fix Emergency Number API doc" into qt-dev 

am: bb2d26cb

Change-Id: I01159df8db6c433f84d331a2b4757388ab6602c7
parents 2192648b bb2d26cb

telephony/java/android/telephony/TelephonyManager.java

+6 −6
Original line number Diff line number Diff line
@@ -10412,10 +10412,10 @@ public class TelephonyManager { 
     * <p>Requires permission {@link android.Manifest.permission#READ_PHONE_STATE} or the calling

     * app has carrier privileges (see {@link #hasCarrierPrivileges}).

     *

     * @return Map including the key as the active subscription ID (Note: if there is no active

     * @return Map including the keys as the active subscription IDs (Note: if there is no active

     * subscription, the key is {@link SubscriptionManager#getDefaultSubscriptionId}) and the value

     * as the list of {@link EmergencyNumber}; null if this information is not available; or throw

     * a SecurityException if the caller does not have the permission.

     * as the list of {@link EmergencyNumber}; empty Map if this information is not available;

     * or throw a SecurityException if the caller does not have the permission.

     */

    @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE)

    @NonNull
@@ -10465,10 +10465,10 @@ public class TelephonyManager { 
     * <li>{@link EmergencyNumber#EMERGENCY_SERVICE_CATEGORY_MIEC} </li>

     * <li>{@link EmergencyNumber#EMERGENCY_SERVICE_CATEGORY_AIEC} </li>

     * </ol>

     * @return Map including the key as the active subscription ID (Note: if there is no active

     * @return Map including the keys as the active subscription IDs (Note: if there is no active

     * subscription, the key is {@link SubscriptionManager#getDefaultSubscriptionId}) and the value

     * as the list of {@link EmergencyNumber}; null if this information is not available; or throw

     * a SecurityException if the caller does not have the permission.

     * as the list of {@link EmergencyNumber}; empty Map if this information is not available;

     * or throw a SecurityException if the caller does not have the permission.

     */

    @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE)

    @NonNull