summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNick Pelly <npelly@google.com>2010-12-07 22:55:21 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2010-12-07 22:55:21 -0800
commit40ddd4a64908c0cbe4970d2ba1703f74717620a8 (patch)
treee6c9f658fb8f594941cb6b93189804ebad45e424
parent5289b91c885158094988a9a7b51b3139565eb639 (diff)
parent6d9fc7e1efa9e99bdab366fc5d579c139fd04e71 (diff)
downloadframeworks_base-40ddd4a64908c0cbe4970d2ba1703f74717620a8.zip
frameworks_base-40ddd4a64908c0cbe4970d2ba1703f74717620a8.tar.gz
frameworks_base-40ddd4a64908c0cbe4970d2ba1703f74717620a8.tar.bz2
Merge "Implemented getSize() to return max ndef size." into gingerbread
-rw-r--r--core/java/android/nfc/technology/Ndef.java12
1 files changed, 11 insertions, 1 deletions
diff --git a/core/java/android/nfc/technology/Ndef.java b/core/java/android/nfc/technology/Ndef.java
index 1e3da2a..c856646 100644
--- a/core/java/android/nfc/technology/Ndef.java
+++ b/core/java/android/nfc/technology/Ndef.java
@@ -47,12 +47,22 @@ public final class Ndef extends BasicTagTechnology {
/** @hide */
public static final String EXTRA_NDEF_MSG = "ndefmsg";
+ /** @hide */
+ public static final String EXTRA_NDEF_MAXLENGTH = "ndefmaxlength";
+
+ private final int maxNdefSize;
+
/**
* Internal constructor, to be used by NfcAdapter
* @hide
*/
public Ndef(NfcAdapter adapter, Tag tag, int tech, Bundle extras) throws RemoteException {
super(adapter, tag, tech);
+ if (extras != null) {
+ maxNdefSize = extras.getInt(EXTRA_NDEF_MAXLENGTH);
+ } else {
+ maxNdefSize = 0; //TODO: throw exception
+ }
}
/**
@@ -95,7 +105,7 @@ public final class Ndef extends BasicTagTechnology {
* Get maximum NDEF message size in bytes
*/
public int getSize() {
- throw new UnsupportedOperationException();
+ return maxNdefSize;
}
/**