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

Commit 4e6b3f10 authored by Michael Groover's avatar Michael Groover Committed by Automerger Merge Worker
Browse files

Merge "Update SubscriptionInfo ICCID docs to reflect security patch behavior"... 

Merge "Update SubscriptionInfo ICCID docs to reflect security patch behavior" into sc-dev am: 97330830

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

Change-Id: I7eaa990c794c4f8b2dfb14ef6119cb224f451f0d
parents b1ad3da4 97330830

telephony/java/android/telephony/SubscriptionInfo.java

+4 −4
Original line number Diff line number Diff line
@@ -311,8 +311,8 @@ public class SubscriptionInfo implements Parcelable { 
    /**

     * Returns the ICC ID.

     *

     * Starting with API level 30, returns the ICC ID if the calling app has been granted the

     * READ_PRIVILEGED_PHONE_STATE permission, has carrier privileges (see

     * Starting with API level 29 Security Patch 2021-04-05, returns the ICC ID if the calling app

     * has been granted the READ_PRIVILEGED_PHONE_STATE permission, has carrier privileges (see

     * {@link TelephonyManager#hasCarrierPrivileges}), or is a device owner or profile owner that

     * has been granted the READ_PHONE_STATE permission. The profile owner is an app that owns a

     * managed profile on the device; for more details see <a
@@ -699,8 +699,8 @@ public class SubscriptionInfo implements Parcelable { 
    /**

     * Returns the card string of the SIM card which contains the subscription.

     *

     * Starting with API level 30, returns the card string if the calling app has been granted the

     * READ_PRIVILEGED_PHONE_STATE permission, has carrier privileges (see

     * Starting with API level 29 Security Patch 2021-04-05, returns the card string if the calling

     * app has been granted the READ_PRIVILEGED_PHONE_STATE permission, has carrier privileges (see

     * {@link TelephonyManager#hasCarrierPrivileges}), or is a device owner or profile owner that

     * has been granted the READ_PHONE_STATE permission. The profile owner is an app that owns a

     * managed profile on the device; for more details see <a