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

Commit a3c92d65 authored by Martijn Coenen's avatar Martijn Coenen Committed by Android Git Automerger
Browse files

am fb2f8337: NFC: @hide and remove abstract from processCommandApdu(). 

* commit 'fb2f8337':
  NFC: @hide and remove abstract from processCommandApdu().
parents 47fd3257 fb2f8337

api/current.txt

+0 −1
Original line number Original line Diff line number Diff line
@@ -15285,7 +15285,6 @@ package android.nfc.cardemulation { 
    method public final android.os.IBinder onBind(android.content.Intent);

    method public final android.os.IBinder onBind(android.content.Intent);

    method public abstract void onDeactivated(int);

    method public abstract void onDeactivated(int);

    method public byte[] processCommandApdu(byte[], android.os.Bundle);

    method public byte[] processCommandApdu(byte[], android.os.Bundle);

    method public abstract deprecated byte[] processCommandApdu(byte[], int);

    method public final void sendResponseApdu(byte[]);

    method public final void sendResponseApdu(byte[]);

    field public static final int DEACTIVATION_DESELECTED = 1; // 0x1

    field public static final int DEACTIVATION_DESELECTED = 1; // 0x1

    field public static final int DEACTIVATION_LINK_LOSS = 0; // 0x0

    field public static final int DEACTIVATION_LINK_LOSS = 0; // 0x0

core/java/android/nfc/cardemulation/HostApduService.java

+5 −2
Original line number Original line Diff line number Diff line
@@ -149,7 +149,7 @@ public abstract class HostApduService extends Service { 




                byte[] apdu = dataBundle.getByteArray(KEY_DATA);

                byte[] apdu = dataBundle.getByteArray(KEY_DATA);

                if (apdu != null) {

                if (apdu != null) {

                    byte[] responseApdu = processCommandApdu(apdu, 0);

                    byte[] responseApdu = processCommandApdu(apdu, null);

                    if (responseApdu != null) {

                    if (responseApdu != null) {

                        if (mNfcService == null) {

                        if (mNfcService == null) {

                            Log.e(TAG, "Response not sent; service was deactivated.");

                            Log.e(TAG, "Response not sent; service was deactivated.");
@@ -308,8 +308,11 @@ public abstract class HostApduService extends Service { 
     * @param flags

     * @param flags

     * @return a byte-array containing the response APDU, or null if no

     * @return a byte-array containing the response APDU, or null if no

     *         response APDU can be sent at this point.

     *         response APDU can be sent at this point.

     * @hide

     */

     */

    public abstract byte[] processCommandApdu(byte[] commandApdu, int flags);

    public byte[] processCommandApdu(byte[] commandApdu, int flags) {

        return null;

    }





    /**

    /**

     * This method will be called in two possible scenarios:

     * This method will be called in two possible scenarios: