am 7c68bc38: Merge "Unhide some NFC APIs that are required for the Tag app." into gingerbread

3 files changed, 36 insertions, 9 deletions

diff --git a/api/current.xml b/api/current.xml
index 38b01fb..2e48b67 100644
--- a/api/current.xml
+++ b/api/current.xml
@@ -101866,6 +101866,18 @@
  deprecated="not deprecated"
  visibility="public"
 >
+<parameter name="data" type="byte[]">
+</parameter>
+<exception name="FormatException" type="android.nfc.FormatException">
+</exception>
+</constructor>
+<constructor name="NdefMessage"
+ type="android.nfc.NdefMessage"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
 <parameter name="records" type="android.nfc.NdefRecord[]">
 </parameter>
 </constructor>
@@ -101891,6 +101903,17 @@
  visibility="public"
 >
 </method>
+<method name="toByteArray"
+ return="byte[]"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
 <method name="writeToParcel"
  return="void"
  abstract="false"
@@ -102010,6 +102033,17 @@
  visibility="public"
 >
 </method>
+<method name="toByteArray"
+ return="byte[]"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
 <method name="writeToParcel"
  return="void"
  abstract="false"
diff --git a/core/java/android/nfc/NdefMessage.java b/core/java/android/nfc/NdefMessage.java
index 378304e..feca94e 100644
--- a/core/java/android/nfc/NdefMessage.java
+++ b/core/java/android/nfc/NdefMessage.java
@@ -34,15 +34,12 @@ public class NdefMessage implements Parcelable {
 
     private final NdefRecord[] mRecords;
 
-    //TODO(npelly) FormatException
     /**
      * Create an NDEF message from raw bytes.
      * <p>
      * Validation is performed to make sure the Record format headers are valid,
      * and the ID + TYPE + PAYLOAD fields are of the correct size.
      * @throws FormatException
-     *
-     * @hide
      */
     public NdefMessage(byte[] data) throws FormatException {
         mRecords = null;  // stop compiler complaints about final field
@@ -69,10 +66,7 @@ public class NdefMessage implements Parcelable {
     }
 
     /**
-     * Get a byte array representation of this NDEF message.
-     *
-     * @return byte array
-     * @hide
+     * Returns a byte array representation of this entire NDEF message.
      */
     public byte[] toByteArray() {
         //TODO(nxp): do not return null
diff --git a/core/java/android/nfc/NdefRecord.java b/core/java/android/nfc/NdefRecord.java
index edc5ab9..557e44d 100644
--- a/core/java/android/nfc/NdefRecord.java
+++ b/core/java/android/nfc/NdefRecord.java
@@ -247,8 +247,7 @@ public class NdefRecord implements Parcelable {
     }
 
     /**
-     * Return this NDEF Record as a byte array.
-     * @hide
+     * Returns this entire NDEF Record as a byte array.
      */
     public byte[] toByteArray() {
         return generate(mFlags, mTnf, mType, mId, mPayload);