summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorMartijn Coenen <maco@google.com>2012-09-24 16:38:57 -0700
committerJean-Baptiste Queru <jbq@google.com>2012-09-25 09:31:50 -0700
commitf8538594fe6ba6db3310da042597840601d78cda (patch)
tree774b2e5652e35345cabcc6fe3ca9a1b2186f2491 /core
parent1b242759763205fa529591738cbe213fcc25150e (diff)
downloadframeworks_base-f8538594fe6ba6db3310da042597840601d78cda.zip
frameworks_base-f8538594fe6ba6db3310da042597840601d78cda.tar.gz
frameworks_base-f8538594fe6ba6db3310da042597840601d78cda.tar.bz2
Fix build.
Bug: 7222958 Change-Id: I2f9ff988f09be6cd4be49bfb90750a46e63c2c14
Diffstat (limited to 'core')
-rw-r--r--core/java/android/nfc/Tag.java4
-rw-r--r--core/java/android/nfc/tech/NfcBarcode.java2
2 files changed, 5 insertions, 1 deletions
diff --git a/core/java/android/nfc/Tag.java b/core/java/android/nfc/Tag.java
index f9b765c..f2cd232 100644
--- a/core/java/android/nfc/Tag.java
+++ b/core/java/android/nfc/Tag.java
@@ -24,6 +24,7 @@ import android.nfc.tech.Ndef;
import android.nfc.tech.NdefFormatable;
import android.nfc.tech.NfcA;
import android.nfc.tech.NfcB;
+import android.nfc.tech.NfcBarcode;
import android.nfc.tech.NfcF;
import android.nfc.tech.NfcV;
import android.nfc.tech.TagTechnology;
@@ -184,6 +185,9 @@ public final class Tag implements Parcelable {
case TagTechnology.NFC_V:
strings[i] = NfcV.class.getName();
break;
+ case TagTechnology.NFC_BARCODE:
+ strings[i] = NfcBarcode.class.getName();
+ break;
default:
throw new IllegalArgumentException("Unknown tech type " + techList[i]);
}
diff --git a/core/java/android/nfc/tech/NfcBarcode.java b/core/java/android/nfc/tech/NfcBarcode.java
index 099f07e..3149857 100644
--- a/core/java/android/nfc/tech/NfcBarcode.java
+++ b/core/java/android/nfc/tech/NfcBarcode.java
@@ -73,7 +73,7 @@ public final class NfcBarcode extends BasicTagTechnology {
/**
* Returns the NFC Barcode tag type.
*
- * <p>Currently only one of {@link #TYPE_KOVIO} or {@link TYPE_UNKNOWN}.
+ * <p>Currently only one of {@link #TYPE_KOVIO} or {@link #TYPE_UNKNOWN}.
*
* <p>Does not cause any RF activity and does not block.
*