Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "To read the Group UUID, the Caller must also have the USE_ICC_AUTH_WITH_DEVICE_IDENTIFIER permission." into tm-dev am: f50f5235b0 am: 442e1650cf am: e093a8f29d

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

Change-Id: Id30e8cc8599c3111573eeaf2dc82dfc09657f649
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Brad Ebinger
2022-05-10 05:42:46 +00:00
committed by Automerger Merge Worker
parent a0611a959a e093a8f29d
commit 25c64b8a1b
1 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
telephony/java/android/telephony/SubscriptionManager.java
View File

@@ -3426,10 +3426,21 @@ public class SubscriptionManager {
* Get subscriptionInfo list of subscriptions that are in the same group of given subId. * Get subscriptionInfo list of subscriptions that are in the same group of given subId.
* See {@link #createSubscriptionGroup(List)} for more details. * See {@link #createSubscriptionGroup(List)} for more details.
* *
* Caller will either have {@link android.Manifest.permission#READ_PHONE_STATE} * Caller must have {@link android.Manifest.permission#READ_PHONE_STATE}
* permission or had carrier privilege permission on the subscription. * or carrier privilege permission on the subscription.
* {@link TelephonyManager#hasCarrierPrivileges()} * {@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 IllegalStateException if Telephony service is in bad state.
* @throws SecurityException if the caller doesn't meet the requirements * @throws SecurityException if the caller doesn't meet the requirements
* outlined above. * outlined above.