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

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

Browse Source
This commit is contained in:
Michael Groover
2021-05-27 23:18:46 +00:00
committed by Android (Google) Code Review
parent 2430a0b314 c66ef8f279
commit 97330830d9
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
telephony/java/android/telephony/SubscriptionInfo.java
View File

@@ -311,8 +311,8 @@ public class SubscriptionInfo implements Parcelable {
/** /**
* Returns the ICC ID. * Returns the ICC ID.
* *
* Starting with API level 30, returns the ICC ID if the calling app has been granted the * Starting with API level 29 Security Patch 2021-04-05, returns the ICC ID if the calling app
* READ_PRIVILEGED_PHONE_STATE permission, has carrier privileges (see * 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 * {@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 * 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 * 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. * 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 * Starting with API level 29 Security Patch 2021-04-05, returns the card string if the calling
* READ_PRIVILEGED_PHONE_STATE permission, has carrier privileges (see * 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 * {@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 * 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 * managed profile on the device; for more details see <a