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

Commit 787a5da7 authored by Aishwarya Mallampati's avatar Aishwarya Mallampati Committed by Automerger Merge Worker
Browse files

Merge "Update javadocs for canManageSubscription." into udc-dev am: fe6fd1dc am: bffb6dc3 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22368022



Change-Id: I3d0a99fc81a5feb3a9b6900e5017590da81ebef5
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 034c7c0b bffb6dc3

telephony/java/android/telephony/SubscriptionManager.java

+2 −2
Original line number Diff line number Diff line
@@ -3142,10 +3142,10 @@ public class SubscriptionManager { 
     *

     * Only supported for embedded subscriptions (if {@link SubscriptionInfo#isEmbedded} returns

     * true). To check for permissions for non-embedded subscription as well,

     * see {@link android.telephony.TelephonyManager#hasCarrierPrivileges}.

     *

     * @param info The subscription to check.

     * @return whether the app is authorized to manage this subscription per its metadata.

     *

     * @see android.telephony.TelephonyManager#hasCarrierPrivileges

     */

    public boolean canManageSubscription(SubscriptionInfo info) {
@@ -3159,12 +3159,12 @@ public class SubscriptionManager { 
     *

     * Only supported for embedded subscriptions (if {@link SubscriptionInfo#isEmbedded} returns

     * true). To check for permissions for non-embedded subscription as well,

     * see {@link android.telephony.TelephonyManager#hasCarrierPrivileges}.

     *

     * @param info The subscription to check.

     * @param packageName Package name of the app to check.

     *

     * @return whether the app is authorized to manage this subscription per its access rules.

     *

     * @see android.telephony.TelephonyManager#hasCarrierPrivileges

     * @hide

     */