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

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

Merge "Document "disable default Beam" meta-data entry."

parents 970abd9b 854e0775
Loading
Loading
Loading
Loading
+24 −2
Original line number Diff line number Diff line
@@ -580,7 +580,18 @@ public final class NfcAdapter {
     * and/or {@link #setNdefPushMessageCallback} is called with a null callback,
     * then NDEF push will be completely disabled for the specified activity(s).
     * This also disables any default NDEF message the Android OS would have
     * otherwise sent on your behalf.
     * otherwise sent on your behalf for those activity(s).
     *
     * <p>If you want to prevent the Android OS from sending default NDEF
     * messages completely (for all activities), you can include a
     * <code><meta-data></code> element inside the <code><application></code>
     * element of your AndroidManifest.xml file, like this:
     * <pre>{@code
     *  <application ...>
     *      <meta-data android:name="android.nfc.disable_beam_default"
     *          android:value="true" />
     *  </application>
     * }</pre>
     *
     * <p>The API allows for multiple activities to be specified at a time,
     * but it is strongly recommended to just register one at a time,
@@ -664,7 +675,18 @@ public final class NfcAdapter {
     * and/or {@link #setNdefPushMessageCallback} is called with a null callback,
     * then NDEF push will be completely disabled for the specified activity(s).
     * This also disables any default NDEF message the Android OS would have
     * otherwise sent on your behalf.
     * otherwise sent on your behalf for those activity(s).
     *
     * <p>If you want to prevent the Android OS from sending default NDEF
     * messages completely (for all activities), you can include a
     * <code><meta-data></code> element inside the <code><application></code>
     * element of your AndroidManifest.xml file, like this:
     * <pre>{@code
     *  <application ...>
     *      <meta-data android:name="android.nfc.disable_beam_default"
     *          android:value="true" />
     *  </application>
     * }</pre>
     *
     * <p>The API allows for multiple activities to be specified at a time,
     * but it is strongly recommended to just register one at a time,