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

Commit b7c5dc68 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 am: 4e6b3f10

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

Change-Id: I90f9108d6f59c19f43f57f897d3dc08426ad9b24
parents 3ca7a4aa 4e6b3f10

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