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

Commit 0754cb75 authored by Martijn Coenen's avatar Martijn Coenen Committed by Android Git Automerger
Browse files

am 1f8d7f61: am 370b593c: Merge "Rename FLAG_READER_NFC_KOVIO to... 

am 1f8d7f61: am 370b593c: Merge "Rename FLAG_READER_NFC_KOVIO to FLAG_READER_NFC_BARCODE." into klp-dev

* commit '1f8d7f61':
  Rename FLAG_READER_NFC_KOVIO to FLAG_READER_NFC_BARCODE.
parents 04367272 1f8d7f61

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -15260,9 +15260,9 @@ package android.nfc { 
    field public static final java.lang.String EXTRA_NDEF_MESSAGES = "android.nfc.extra.NDEF_MESSAGES";

    field public static final java.lang.String EXTRA_READER_PRESENCE_CHECK_DELAY = "presence";

    field public static final java.lang.String EXTRA_TAG = "android.nfc.extra.TAG";

    field public static final int FLAG_READER_KOVIO = 16; // 0x10

    field public static final int FLAG_READER_NFC_A = 1; // 0x1

    field public static final int FLAG_READER_NFC_B = 2; // 0x2

    field public static final int FLAG_READER_NFC_BARCODE = 16; // 0x10

    field public static final int FLAG_READER_NFC_F = 4; // 0x4

    field public static final int FLAG_READER_NFC_V = 8; // 0x8

    field public static final int FLAG_READER_NO_PLATFORM_SOUNDS = 256; // 0x100

core/java/android/nfc/NfcAdapter.java

+2 −2
Original line number Diff line number Diff line
@@ -227,9 +227,9 @@ public final class NfcAdapter { 
    /**

     * Flag for use with {@link #enableReaderMode(Activity, ReaderCallback, int, Bundle)}.

     * <p>

     * Setting this flag enables polling for Kovio technology.

     * Setting this flag enables polling for NfcBarcode technology.

     */

    public static final int FLAG_READER_KOVIO = 0x10;

    public static final int FLAG_READER_NFC_BARCODE = 0x10;



    /**

     * Flag for use with {@link #enableReaderMode(Activity, ReaderCallback, int, Bundle)}.