Merge "Unhide some NFC APIs that are required for the Tag app." into gingerbread (7c68bc38) · Commits · e / os / android_frameworks_base

api/current.xml

+34 −0

Original line number	Diff line number	Diff line
		@@ -99804,6 +99804,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>
		@@ -99829,6 +99841,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"
		@@ -99948,6 +99971,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"

+1 −7

Original line number	Diff line number	Diff line
		@@ -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

+1 −2

Original line number	Diff line number	Diff line
		@@ -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);