summaryrefslogtreecommitdiff
path: root/telephony/java
diff options
context:
space:
mode:
authorMichael Groover <mpgroover@google.com>2021-05-27 23:18:46 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2021-05-27 23:18:46 +0000
commit97330830d9ee46808b573bbaa340af654b89c411 (patch)
treedd0776d58fd241c47e1690c3d4468528f2ce2be5 /telephony/java
parent2430a0b31462b0b16e801612d3e30e0a383d6136 (diff)
parentc66ef8f279f2dd9778d38ce9bd7de231b3204395 (diff)
Merge "Update SubscriptionInfo ICCID docs to reflect security patch behavior" into sc-dev
Diffstat (limited to 'telephony/java')
-rw-r--r--telephony/java/android/telephony/SubscriptionInfo.java8
1 files changed, 4 insertions, 4 deletions
diff --git a/telephony/java/android/telephony/SubscriptionInfo.java b/telephony/java/android/telephony/SubscriptionInfo.java
index 21bb43cb6f32..2d50e08ab922 100644
--- a/telephony/java/android/telephony/SubscriptionInfo.java
+++ b/telephony/java/android/telephony/SubscriptionInfo.java
@@ -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