summaryrefslogtreecommitdiffstats
path: root/core/java
diff options
context:
space:
mode:
authorMartijn Coenen <maco@google.com>2013-09-03 11:38:19 -0700
committerMartijn Coenen <maco@google.com>2013-09-03 11:40:35 -0700
commitfb2f8337f6fca9809156ddbaf0a7fe468bc1329f (patch)
tree0820441c95b6d9116150747673019d864f042fc3 /core/java
parent5c2dfa8a21e7bd4e07e00f268d30058b654aa099 (diff)
downloadframeworks_base-fb2f8337f6fca9809156ddbaf0a7fe468bc1329f.zip
frameworks_base-fb2f8337f6fca9809156ddbaf0a7fe468bc1329f.tar.gz
frameworks_base-fb2f8337f6fca9809156ddbaf0a7fe468bc1329f.tar.bz2
NFC: @hide and remove abstract from processCommandApdu().
Replaced by new version with Bundle extras. Bug: 10550349 Change-Id: If5f284c6d9b14ab32670ebc84881f459813b5b56
Diffstat (limited to 'core/java')
-rw-r--r--core/java/android/nfc/cardemulation/HostApduService.java7
1 files changed, 5 insertions, 2 deletions
diff --git a/core/java/android/nfc/cardemulation/HostApduService.java b/core/java/android/nfc/cardemulation/HostApduService.java
index 1bb2ea4..615ef02 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: