From fb2f8337f6fca9809156ddbaf0a7fe468bc1329f Mon Sep 17 00:00:00 2001
From: Martijn Coenen <maco@google.com>
Date: Tue, 3 Sep 2013 11:38:19 -0700
Subject: [PATCH] NFC: @hide and remove abstract from processCommandApdu().

Replaced by new version with Bundle extras.

Bug: 10550349
Change-Id: If5f284c6d9b14ab32670ebc84881f459813b5b56
---
 api/current.txt                                          | 1 -
 core/java/android/nfc/cardemulation/HostApduService.java | 7 +++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/api/current.txt b/api/current.txt
index 4e1051bfd48ac..6589a4822cb82 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -15285,7 +15285,6 @@ package android.nfc.cardemulation {
     method public final android.os.IBinder onBind(android.content.Intent);
     method public abstract void onDeactivated(int);
     method public byte[] processCommandApdu(byte[], android.os.Bundle);
-    method public abstract deprecated byte[] processCommandApdu(byte[], int);
     method public final void sendResponseApdu(byte[]);
     field public static final int DEACTIVATION_DESELECTED = 1; // 0x1
     field public static final int DEACTIVATION_LINK_LOSS = 0; // 0x0
diff --git a/core/java/android/nfc/cardemulation/HostApduService.java b/core/java/android/nfc/cardemulation/HostApduService.java
index 1bb2ea417bf2e..615ef021e9bbb 100644
--- a/core/java/android/nfc/cardemulation/HostApduService.java
+++ b/core/java/android/nfc/cardemulation/HostApduService.java
@@ -149,7 +149,7 @@ public abstract class HostApduService extends Service {
 
                 byte[] apdu = dataBundle.getByteArray(KEY_DATA);
                 if (apdu != null) {
-                    byte[] responseApdu = processCommandApdu(apdu, 0);
+                    byte[] responseApdu = processCommandApdu(apdu, null);
                     if (responseApdu != null) {
                         if (mNfcService == null) {
                             Log.e(TAG, "Response not sent; service was deactivated.");
@@ -308,8 +308,11 @@ public abstract class HostApduService extends Service {
      * @param flags
      * @return a byte-array containing the response APDU, or null if no
      *         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: