From 6c65344fcf5aa1499dafe1cad1d1ba5c66293776 Mon Sep 17 00:00:00 2001 From: Martijn Coenen Date: Thu, 29 Mar 2012 15:31:13 -0700 Subject: [PATCH] Fix permission documentation. It was incorrect in one case. Also removed obsolete interface method. Change-Id: I211fb57e3504e06ff09cf31857c89e2b0e93d679 --- core/java/android/nfc/INfcTag.aidl | 1 - core/java/android/nfc/tech/Ndef.java | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/core/java/android/nfc/INfcTag.aidl b/core/java/android/nfc/INfcTag.aidl index 102b6af5f64e1..2223255ec91a0 100644 --- 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 index b1d53036aaa88..a31cb9caec198 100644 --- a/core/java/android/nfc/tech/Ndef.java +++ b/core/java/android/nfc/tech/Ndef.java @@ -256,6 +256,8 @@ public final class Ndef extends BasicTagTechnology { * 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. * + *

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