Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a7907d78 authored by Jordan Liu's avatar Jordan Liu Committed by android-build-merger
Browse files

Merge "Update getUiccCardsInfo doc" into qt-dev 

am: a49ff8b6

Change-Id: Id421e57e4a4f35d1d8c335177bd928b9bbdc34e8
parents 822a3e01 a49ff8b6

telephony/java/android/telephony/TelephonyManager.java

+1 −1
Original line number Diff line number Diff line
@@ -3327,7 +3327,7 @@ public class TelephonyManager { 
    }



    /**

     * Gets information about currently inserted UICCs and enabled eUICCs.

     * Gets information about currently inserted UICCs and eUICCs.

     * <p>

     * Requires that the calling app has carrier privileges (see {@link #hasCarrierPrivileges}).

     * <p>

telephony/java/android/telephony/UiccCardInfo.java

+2 −2
Original line number Diff line number Diff line
@@ -101,7 +101,7 @@ public final class UiccCardInfo implements Parcelable { 


    /**

     * Get the embedded ID (EID) of the eUICC. If the UiccCardInfo is not an eUICC

     * (see {@link #isEuicc()}), returns null.

     * (see {@link #isEuicc()}), or the EID is not available, returns null.

     * <p>

     * Note that this field may be omitted if the caller does not have the correct permissions

     * (see {@link TelephonyManager#getUiccCardsInfo()}).
@@ -115,7 +115,7 @@ public final class UiccCardInfo implements Parcelable { 
    }



    /**

     * Get the ICCID of the UICC.

     * Get the ICCID of the UICC. If the ICCID is not availble, returns null.

     * <p>

     * Note that this field may be omitted if the caller does not have the correct permissions

     * (see {@link TelephonyManager#getUiccCardsInfo()}).

telephony/java/com/android/internal/telephony/ITelephony.aidl

+1 −1
Original line number Diff line number Diff line
@@ -1594,7 +1594,7 @@ interface ITelephony { 
    int getCardIdForDefaultEuicc(int subId, String callingPackage);



    /**

     * Gets information about currently inserted UICCs and enabled eUICCs.

     * Gets information about currently inserted UICCs and eUICCs.

     * <p>

     * Requires that the calling app has carrier privileges (see {@link #hasCarrierPrivileges}).

     * <p>