Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5eeee5e0 authored by Martijn Coenen's avatar Martijn Coenen Committed by Android (Google) Code Review
Browse files

Merge "Fix permission documentation."

parents 75f6ad6c 6c65344f

core/java/android/nfc/INfcTag.aidl

+0 −1
Original line number Diff line number Diff line
@@ -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);

core/java/android/nfc/tech/Ndef.java

+2 −0
Original line number Diff line number Diff line
@@ -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