drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix technology extra naming for IsoDep and NfcB (API part)." into gingerbread

Browse Source
This commit is contained in:
Nick Pelly
2011-01-04 18:31:19 -08:00
committed by Android (Google) Code Review
parent 273d2ea3f9 a559aa4759
commit 8d98aebe28
2 changed files with 24 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/java/android/nfc/technology/IsoDep.java
View File

@ -39,18 +39,18 @@ import java.io.IOException;
*/ */
public final class IsoDep extends BasicTagTechnology { public final class IsoDep extends BasicTagTechnology {
/** @hide */ /** @hide */
public static final String EXTRA_ATTRIB = "attrib"; public static final String EXTRA_HI_LAYER_RESP = "hiresp";
/** @hide */ /** @hide */
public static final String EXTRA_HIST_BYTES = "histbytes"; public static final String EXTRA_HIST_BYTES = "histbytes";
private byte[] mAttrib = null; private byte[] mHiLayerResponse = null;
private byte[] mHistBytes = null; private byte[] mHistBytes = null;
public IsoDep(NfcAdapter adapter, Tag tag, Bundle extras) public IsoDep(NfcAdapter adapter, Tag tag, Bundle extras)
throws RemoteException { throws RemoteException {
super(adapter, tag, TagTechnology.ISO_DEP); super(adapter, tag, TagTechnology.ISO_DEP);
if (extras != null) { if (extras != null) {
mAttrib = extras.getByteArray(EXTRA_ATTRIB); mHiLayerResponse = extras.getByteArray(EXTRA_HI_LAYER_RESP);
mHistBytes = extras.getByteArray(EXTRA_HIST_BYTES); mHistBytes = extras.getByteArray(EXTRA_HIST_BYTES);
} }
} }
@ -63,5 +63,5 @@ public final class IsoDep extends BasicTagTechnology {
/** /**
* 3B only * 3B only
*/ */
public byte[] getAttrib() { return mAttrib; } public byte[] getHiLayerResponse() { return mHiLayerResponse; }
} }

26
core/java/android/nfc/technology/NfcB.java
View File

@ -37,20 +37,34 @@ import android.os.RemoteException;
*/ */
public final class NfcB extends BasicTagTechnology { public final class NfcB extends BasicTagTechnology {
/** @hide */ /** @hide */
public static final String EXTRA_ATQB = "atqb"; public static final String EXTRA_APPDATA = "appdata";
/** @hide */
public static final String EXTRA_PROTINFO = "protinfo";
private byte[] mAtqb; private byte[] mAppData;
private byte[] mProtInfo;
public NfcB(NfcAdapter adapter, Tag tag, Bundle extras) public NfcB(NfcAdapter adapter, Tag tag, Bundle extras)
throws RemoteException { throws RemoteException {
super(adapter, tag, TagTechnology.NFC_B); super(adapter, tag, TagTechnology.NFC_B);
mAtqb = extras.getByteArray(EXTRA_ATQB); mAppData = extras.getByteArray(EXTRA_APPDATA);
mProtInfo = extras.getByteArray(EXTRA_PROTINFO);
} }
/** /**
* Returns the ATQB/SENSB_RES bytes discovered at tag discovery. * Returns the Application Data bytes from the ATQB/SENSB_RES
* bytes discovered at tag discovery.
*/ */
public byte[] getAtqb() { public byte[] getApplicationData() {
return mAtqb; return mAppData;
} }
/**
* Returns the Protocol Info bytes from the ATQB/SENSB_RES
* bytes discovered at tag discovery.
*/
public byte[] getProtocolInfo() {
return mProtInfo;
}
} }