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

Commit b010a6aa authored by Hyosun Kim's avatar Hyosun Kim Committed by Automerger Merge Worker
Browse files

Merge "To read the group UUID, the calling app either needs carrier privileges... 

Merge "To read the group UUID, the calling app either needs carrier privileges or the READ_PHONE_STATE permission and access to device identifiers." into tm-qpr-dev am: 2dbb6cb4

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



Change-Id: I6c4f52543ce38701f28ffb88710bcc4cd71f1e02
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9ba30899 2dbb6cb4

telephony/java/android/telephony/SubscriptionManager.java

+12 −2
Original line number Diff line number Diff line
@@ -3425,10 +3425,20 @@ 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, this method will return an empty List if the caller does

     * not have access to device identifiers.

     * 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} permission and

     *     access to device identifiers.

     * </ul>

     *

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

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

     *             outlined above.