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

Commit 25c64b8a authored by Brad Ebinger's avatar Brad Ebinger Committed by Automerger Merge Worker
Browse files

Merge "To read the Group UUID, the Caller must also have the... 

Merge "To read the Group UUID, the Caller must also have the USE_ICC_AUTH_WITH_DEVICE_IDENTIFIER permission." into tm-dev am: f50f5235 am: 442e1650 am: e093a8f2

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



Change-Id: Id30e8cc8599c3111573eeaf2dc82dfc09657f649
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a0611a95 e093a8f2

telephony/java/android/telephony/SubscriptionManager.java

+13 −2
Original line number Diff line number Diff line
@@ -3426,10 +3426,21 @@ public class SubscriptionManager { 
     * Get subscriptionInfo list of subscriptions that are in the same group of given subId.

     * See {@link #createSubscriptionGroup(List)} for more details.

     *

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

     * permission or had carrier privilege permission on the subscription.

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

     * or carrier privilege permission on the subscription.

     * {@link TelephonyManager#hasCarrierPrivileges()}

     *

     * <p>Starting with API level 33, the caller needs the additional permission

     * {@link Manifest.permission#USE_ICC_AUTH_WITH_DEVICE_IDENTIFIER}

     * to get the list of subscriptions associated with a group UUID.

     * This method can be invoked if one of the following requirements is met:

     * <ul>

     *     <li>If the app has carrier privilege permission.

     *     {@link TelephonyManager#hasCarrierPrivileges()}

     *     <li>If the app has {@link android.Manifest.permission#READ_PHONE_STATE} and

     *     {@link Manifest.permission#USE_ICC_AUTH_WITH_DEVICE_IDENTIFIER} permission.

     * </ul>

     *

     * @throws IllegalStateException if Telephony service is in bad state.

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

     *             outlined above.