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

Merge "Add method to clear out SubscriptionInfo#getCardString" into rvc-dev am: 6d4c98513b

Browse Source 
Change-Id: I885f71adad138859655836ebeeb2797241de34c7
This commit is contained in:
Michael Groover
2020-03-23 21:41:16 +00:00
committed by Automerger Merge Worker
parent 1057ead868 6d4c98513b
commit 490fa33fe3
1 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -662,8 +662,16 @@ public class SubscriptionInfo implements Parcelable {
} }
/** /**
* @return the card string of the SIM card which contains the subscription. The card string is * Returns the card string if the calling app has been granted the READ_PRIVILEGED_PHONE_STATE
* the ICCID for UICCs or the EID for eUICCs. * permission, has carrier privileges (see {@link TelephonyManager#hasCarrierPrivileges}), or
* is a device owner or profile owner on an organization owned device 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 href="https://developer.android.com/work/managed-profiles">
* Work profiles</a>.
*
* @return the card string of the SIM card which contains the subscription or an empty string
* if these requirements are not met. The card string is the ICCID for UICCs or the EID for
* eUICCs.
* @hide * @hide
* //TODO rename usages in LPA: UiccSlotUtil.java, UiccSlotsManager.java, UiccSlotInfoTest.java * //TODO rename usages in LPA: UiccSlotUtil.java, UiccSlotsManager.java, UiccSlotInfoTest.java
*/ */
@@ -671,6 +679,13 @@ public class SubscriptionInfo implements Parcelable {
return this.mCardString; return this.mCardString;
} }
/**
* @hide
*/
public void clearCardString() {
this.mCardString = "";
}
/** /**
* Returns the card ID of the SIM card which contains the subscription (see * Returns the card ID of the SIM card which contains the subscription (see
* {@link UiccCardInfo#getCardId()}. * {@link UiccCardInfo#getCardId()}.