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

Merge "Update annotations for UiccCardInfo APIs"

Browse Source 
am: c76c5529bf

Change-Id: I229d251c7f3749738d407ced2464a44b231f9bf5
This commit is contained in:
Jordan Liu
2019-02-28 05:18:17 -08:00
committed by android-build-merger
parent bb74d55781 c76c5529bf
commit 6549c55523
3 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
api/current.txt
View File

@@ -43072,7 +43072,7 @@ package android.telephony {
method @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) public String getSubscriberId();
method public String getTypeAllocationCode();
method public String getTypeAllocationCode(int);
method @RequiresPermission("android.permission.READ_PRIVILEGED_PHONE_STATE") public java.util.List<android.telephony.UiccCardInfo> getUiccCardsInfo();
method @RequiresPermission("android.permission.READ_PRIVILEGED_PHONE_STATE") @NonNull public java.util.List<android.telephony.UiccCardInfo> getUiccCardsInfo();
method @Nullable @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) public String getVisualVoicemailPackageName();
method @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) public String getVoiceMailAlphaTag();
method @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) public String getVoiceMailNumber();
@@ -43241,8 +43241,8 @@ package android.telephony {
public final class UiccCardInfo implements android.os.Parcelable {
method public int describeContents();
method public int getCardId();
method public String getEid();
method public String getIccId();
method @Nullable public String getEid();
method @Nullable public String getIccId();
method public int getSlotIndex();
method public boolean isEuicc();
method public boolean isRemovable();

1
telephony/java/android/telephony/TelephonyManager.java
View File

@@ -3203,6 +3203,7 @@ public class TelephonyManager {
* the caller does not have adequate permissions for that card.
*/
@RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE)
@NonNull
public List<UiccCardInfo> getUiccCardsInfo() {
try {
ITelephony telephony = getITelephony();

9
telephony/java/android/telephony/UiccCardInfo.java
View File

@@ -15,6 +15,8 @@
*/
package android.telephony;
import android.annotation.NonNull;
import android.annotation.Nullable;
import android.os.Parcel;
import android.os.Parcelable;
@@ -104,6 +106,7 @@ public final class UiccCardInfo implements Parcelable {
* Note that this field may be omitted if the caller does not have the correct permissions
* (see {@link TelephonyManager#getUiccCardsInfo()}).
*/
@Nullable
public String getEid() {
if (!mIsEuicc) {
return null;
@@ -117,6 +120,7 @@ public final class UiccCardInfo implements Parcelable {
* Note that this field may be omitted if the caller does not have the correct permissions
* (see {@link TelephonyManager#getUiccCardsInfo()}).
*/
@Nullable
public String getIccId() {
return mIccId;
}
@@ -129,11 +133,12 @@ public final class UiccCardInfo implements Parcelable {
}
/**
* Returns a copy of the UiccCardinfo with the clears the EID and ICCID set to null. These
* values are generally private and require carrier privileges to view.
* Returns a copy of the UiccCardinfo with the EID and ICCID set to null. These values are
* generally private and require carrier privileges to view.
*
* @hide
*/
@NonNull
public UiccCardInfo getUnprivileged() {
return new UiccCardInfo(mIsEuicc, mCardId, null, null, mSlotIndex, mIsRemovable);
}