Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit 'fb2f8337f6fca9809156ddbaf0a7fe468bc1329f':
  NFC: @hide and remove abstract from processCommandApdu().
This commit is contained in:
Martijn Coenen
2013-09-03 11:49:27 -07:00
committed by Android Git Automerger
parent 47fd325779 fb2f8337f6
commit a3c92d65de
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/current.txt
View File

@@ -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

7
core/java/android/nfc/cardemulation/HostApduService.java
View File

@@ -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: