summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorNick Pelly <npelly@google.com>2011-01-03 22:41:40 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2011-01-03 22:41:40 -0800
commita7a0c21aa2363ca30db3a9ee6d6cb53b8ce3c125 (patch)
treee3f2eb9a827d42f3e08ba5d1a0c155716299a953 /core
parent894a5bda4b143936336d422c8f87f4e5fa631f7b (diff)
parentc5caaf5ff816a664939f305ead1091eb2c02cbf5 (diff)
downloadframeworks_base-a7a0c21aa2363ca30db3a9ee6d6cb53b8ce3c125.zip
frameworks_base-a7a0c21aa2363ca30db3a9ee6d6cb53b8ce3c125.tar.gz
frameworks_base-a7a0c21aa2363ca30db3a9ee6d6cb53b8ce3c125.tar.bz2
am c5caaf5f: am 8f49c025: Merge "Added response flags and DSFID extras for NfcV technology (API part)." into gingerbread
* commit 'c5caaf5ff816a664939f305ead1091eb2c02cbf5': Added response flags and DSFID extras for NfcV technology (API part).
Diffstat (limited to 'core')
-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;
}
}