summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Groover <mpgroover@google.com>2021-05-25 11:24:32 -0700
committerMichael Groover <mpgroover@google.com>2021-05-25 16:07:30 -0700
commitc66ef8f279f2dd9778d38ce9bd7de231b3204395 (patch)
tree192eb3c576c96650de0516b43a07b743691faefc
parent83fbf50685a7380898cd6d7b86acd96a1f208b87 (diff)
Update SubscriptionInfo ICCID docs to reflect security patch behavior
Starting in API level 30 SubscriptionInfo getIccId and getCardString were protected with the new device identifier access requirements since these return the same value as TelephonyManager getSimSerialNumber. However since this value was supposed to be protected by the new device identifier access requirements in API level 29 a fix was added to security patch 2021-04-05 to enforce these new requirements for the SubscriptionInfo ICCID APIs. This commit updates the documentation for these APIs to reflect these new behavior on these security patch levels. Bug: 188770462 Test: m offline-sdk-docs Change-Id: I17e8deb6515b1272e438be6dcbbecb741bd73641
-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