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

Commit 73126135 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 am: c7e742b3 am: 503a8764 am: 94ade9f3

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



Change-Id: I6e8aad16fa3b5bddd44e75e3a787307dea087865
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 7096ab30 94ade9f3

telephony/java/android/telephony/SubscriptionManager.java

+2 −13
Original line number Diff line number Diff line
@@ -3434,21 +3434,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.