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

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

Merge "Update documentation" am: ae25b622 am: ea992811 

am: 1cf81ee8

Change-Id: Ica4407926ea618b6c3d1bafdf80d97f2b51d752b
parents 80d61df3 1cf81ee8

api/system-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -8028,7 +8028,7 @@ package android.telephony { 
    method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public int getVoiceActivationState();

    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public boolean handlePinMmi(String);

    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public boolean handlePinMmiForSubscriber(int, String);

    method @Nullable @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public boolean iccCloseLogicalChannelBySlot(int, int);

    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public boolean iccCloseLogicalChannelBySlot(int, int);

    method @Nullable @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public android.telephony.IccOpenLogicalChannelResponse iccOpenLogicalChannelBySlot(int, @Nullable String, int);

    method @NonNull @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public String iccTransmitApduBasicChannelBySlot(int, int, int, int, int, int, @Nullable String);

    method @Nullable @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public String iccTransmitApduLogicalChannelBySlot(int, int, int, int, int, int, int, @Nullable String);

telephony/java/android/telephony/TelephonyManager.java

+2 −3
Original line number Diff line number Diff line
@@ -5296,7 +5296,6 @@ public class TelephonyManager { 
     */

    @RequiresPermission(Manifest.permission.MODIFY_PHONE_STATE)

    @SystemApi

    @Nullable

    public boolean iccCloseLogicalChannelBySlot(int slotIndex, int channel) {

        try {

            ITelephony telephony = getITelephony();
@@ -5373,8 +5372,8 @@ public class TelephonyManager { 
     * @param p3 P3 value of the APDU command. If p3 is negative a 4 byte APDU

     *            is sent to the SIM.

     * @param data Data to be sent with the APDU.

     * @return The APDU response from the ICC card with the status appended at

     *            the end.

     * @return The APDU response from the ICC card with the status appended at the end, or null if

     * there is an issue connecting to the Telephony service.

     * @hide

     */

    @RequiresPermission(Manifest.permission.MODIFY_PHONE_STATE)