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

Commit e1819858 authored by Xiangyu/Malcolm Chen's avatar Xiangyu/Malcolm Chen Committed by Android (Google) Code Review
Browse files

Merge "Fix broken building offline-sdk-docs."

parents 183bdcf1 4d2dbe20

telephony/java/android/telephony/SubscriptionManager.java

+3 −3
Original line number Diff line number Diff line
@@ -2403,7 +2403,7 @@ public class SubscriptionManager { 
     *

     * Caller will either have {@link android.Manifest.permission#MODIFY_PHONE_STATE}

     * permission or had carrier privilege permission on the subscriptions:

     * {@link TelephonyManager#hasCarrierPrivileges(int)} or

     * {@link TelephonyManager#hasCarrierPrivileges()} or

     * {@link #canManageSubscription(SubscriptionInfo)}

     *

     * @throws SecurityException if the caller doesn't meet the requirements
@@ -2441,7 +2441,7 @@ public class SubscriptionManager { 
     *

     * Caller will either have {@link android.Manifest.permission#MODIFY_PHONE_STATE}

     * permission or had carrier privilege permission on the subscriptions:

     * {@link TelephonyManager#hasCarrierPrivileges(int)} or

     * {@link TelephonyManager#hasCarrierPrivileges()} or

     * {@link #canManageSubscription(SubscriptionInfo)}

     *

     * @throws SecurityException if the caller doesn't meet the requirements
@@ -2477,7 +2477,7 @@ public class SubscriptionManager { 
     *

     * Caller will either have {@link android.Manifest.permission#READ_PHONE_STATE}

     * permission or had carrier privilege permission on the subscription.

     * {@link TelephonyManager#hasCarrierPrivileges(int)}

     * {@link TelephonyManager#hasCarrierPrivileges()}

     *

     * @throws SecurityException if the caller doesn't meet the requirements

     *             outlined above.