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

Commit e5af4b65 authored by Xiangyu/Malcolm Chen's avatar Xiangyu/Malcolm Chen Committed by android-build-merger
Browse files

Merge changes from topic "118349116" am: 90f496b1 

am: 14823f0c

Change-Id: I35bf3e4ca0b829f7bced78924036054b8c170f43
parents 71f85f59 14823f0c

telephony/java/android/telephony/SubscriptionManager.java

+3 −3
Original line number Diff line number Diff line
@@ -2393,7 +2393,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
@@ -2431,7 +2431,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
@@ -2467,7 +2467,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.