diff options
| author | 2012-03-30 09:43:44 -0700 | |
|---|---|---|
| committer | 2012-03-30 09:43:44 -0700 | |
| commit | 5eeee5e0bbf5aba0097a510b3e9dbb286b2b30cd (patch) | |
| tree | 3f03223ef8ad0eed403ac53af8563bfc8de2aaba | |
| parent | 75f6ad6cb2873d9487321811d5b5f5b4e95bffaf (diff) | |
| parent | 6c65344fcf5aa1499dafe1cad1d1ba5c66293776 (diff) | |
Merge "Fix permission documentation."
| -rw-r--r-- | core/java/android/nfc/INfcTag.aidl | 1 | ||||
| -rw-r--r-- | core/java/android/nfc/tech/Ndef.java | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/core/java/android/nfc/INfcTag.aidl b/core/java/android/nfc/INfcTag.aidl index 102b6af5f64e..2223255ec91a 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 b1d53036aaa8..a31cb9caec19 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. * + * <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 |