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

Commit 3d50a3df authored by Shuo Qian's avatar Shuo Qian Committed by Gerrit Code Review
Browse files

Merge "Fix Emergency Number API doc"

parents 90424e80 48b9a1e8

telephony/java/android/telephony/TelephonyManager.java

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

     * <p>Requires permission {@link android.Manifest.permission#READ_PHONE_STATE} or the calling

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

     * 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

     * 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

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

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

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

     */

     */

    @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE)

    @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE)

    @NonNull

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

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

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

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

     * </ol>

     * </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

     * 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

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

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

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

     */

     */

    @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE)

    @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE)

    @NonNull

    @NonNull