am 8abce7f5: am 40ddd4a6: Merge "Implemented getSize() to return max ndef size." into gingerbread

* commit '8abce7f56e4298d3e0035208be48c7afe0e3d2ad':
  Implemented getSize() to return max ndef size.

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 1e3da2abaaee..c85664646432 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;
     }
 
     /**