Merge "Fix permission documentation."

Martijn Coenen · Android (Google) Code Review · commit 5eeee5e0bbf5 · 2012-03-30T09:43:44.000-07:00
diff --git a/core/java/android/nfc/INfcTag.aidl b/core/java/android/nfc/INfcTag.aidl
@@ -29,7 +29,6 @@ interface INfcTag
     int connect(int nativeHandle, int technology);
     int reconnect(int nativeHandle);
     int[] getTechList(int nativeHandle);
-    byte[] getUid(int nativeHandle);
     boolean isNdef(int nativeHandle);
     boolean isPresent(int nativeHandle);
     TransceiveResult transceive(int nativeHandle, in byte[] data, boolean raw);
diff --git a/core/java/android/nfc/tech/Ndef.java b/core/java/android/nfc/tech/Ndef.java
@@ -256,6 +256,8 @@ public boolean isWritable() {
      * not be called from the main application thread. A blocked call will be canceled with
      * {@link IOException} if {@link #close} is called from another thread.
      *
+     * <p class="note">Requires the {@link android.Manifest.permission#NFC} permission.
+     *
      * @return the NDEF Message, can be null
      * @throws TagLostException if the tag leaves the field
      * @throws IOException if there is an I/O failure, or the operation is canceled

Original file line number	Diff line number	Diff line change
`@@ -256,6 +256,8 @@ public boolean isWritable() {`
`256`	`256`	`* not be called from the main application thread. A blocked call will be canceled with`
`257`	`257`	`* {@link IOException} if {@link #close} is called from another thread.`
`258`	`258`	`*`
	`259`	`+ * <p class="note">Requires the {@link android.Manifest.permission#NFC} permission.`
	`260`	`+ *`
`259`	`261`	`* @return the NDEF Message, can be null`
`260`	`262`	`* @throws TagLostException if the tag leaves the field`
`261`	`263`	`* @throws IOException if there is an I/O failure, or the operation is canceled`