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

Commit c7e742b3 authored by Amruth Ramachandran's avatar Amruth Ramachandran Committed by Automerger Merge Worker
Browse files

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

Merge "Revert "To read the Group UUID, the Caller must also have the US..."" into tm-dev am: 34cb65ba

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



Change-Id: I465a7f8f60b9d4e05ccf9ad1d2135ba464a20f87
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b48c3d92 34cb65ba

telephony/java/android/telephony/SubscriptionManager.java

+2 −13
Original line number Diff line number Diff line
@@ -3426,21 +3426,10 @@ 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 must have {@link android.Manifest.permission#READ_PHONE_STATE}

     * or carrier privilege permission on the subscription.

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

     * permission or had 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.