summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNick Pelly <npelly@google.com>2011-01-03 22:39:42 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2011-01-03 22:39:42 -0800
commitc5caaf5ff816a664939f305ead1091eb2c02cbf5 (patch)
tree1b6a9b396690dff3b544467edb8bfdb57e3d241f
parentd81c68c31e916fa201f4cd608261afa4d1f0adb6 (diff)
parent8f49c025ca5b4ed84290fb9e5e0b7acb1c139b35 (diff)
downloadframeworks_base-c5caaf5ff816a664939f305ead1091eb2c02cbf5.zip
frameworks_base-c5caaf5ff816a664939f305ead1091eb2c02cbf5.tar.gz
frameworks_base-c5caaf5ff816a664939f305ead1091eb2c02cbf5.tar.bz2
am 8f49c025: Merge "Added response flags and DSFID extras for NfcV technology (API part)." into gingerbread
* commit '8f49c025ca5b4ed84290fb9e5e0b7acb1c139b35': Added response flags and DSFID extras for NfcV technology (API part).
-rw-r--r--core/java/android/nfc/technology/NfcB.java1
-rw-r--r--core/java/android/nfc/technology/NfcV.java19
2 files changed, 20 insertions, 0 deletions
diff --git a/core/java/android/nfc/technology/NfcB.java b/core/java/android/nfc/technology/NfcB.java
index 64cb08a..de528f8 100644
--- a/core/java/android/nfc/technology/NfcB.java
+++ b/core/java/android/nfc/technology/NfcB.java
@@ -44,6 +44,7 @@ public final class NfcB extends BasicTagTechnology {
public NfcB(NfcAdapter adapter, Tag tag, Bundle extras)
throws RemoteException {
super(adapter, tag, TagTechnology.NFC_B);
+ mAtqb = extras.getByteArray(EXTRA_ATQB);
}
/**
diff --git a/core/java/android/nfc/technology/NfcV.java b/core/java/android/nfc/technology/NfcV.java
index 9b6a16a..460de6a 100644
--- a/core/java/android/nfc/technology/NfcV.java
+++ b/core/java/android/nfc/technology/NfcV.java
@@ -36,8 +36,27 @@ import android.os.RemoteException;
* permission.
*/
public final class NfcV extends BasicTagTechnology {
+ /** @hide */
+ public static final String EXTRA_RESP_FLAGS = "respflags";
+
+ /** @hide */
+ public static final String EXTRA_DSFID = "dsfid";
+
+ private byte mRespFlags;
+ private byte mDsfId;
+
public NfcV(NfcAdapter adapter, Tag tag, Bundle extras)
throws RemoteException {
super(adapter, tag, TagTechnology.NFC_V);
+ mRespFlags = extras.getByte(EXTRA_RESP_FLAGS);
+ mDsfId = extras.getByte(EXTRA_DSFID);
+ }
+
+ public byte getResponseFlags() {
+ return mRespFlags;
+ }
+
+ public byte getDsfId() {
+ return mDsfId;
}
}