Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit '1f8d7f61c07faa7ad566fe2329dcf7923f6221d0':
  Rename FLAG_READER_NFC_KOVIO to FLAG_READER_NFC_BARCODE.
This commit is contained in:
Martijn Coenen
2013-09-16 10:37:45 -07:00
committed by Android Git Automerger
parent 04367272b5 1f8d7f61c0
commit 0754cb7586
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/current.txt
View File

@@ -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

4
core/java/android/nfc/NfcAdapter.java
View File

@@ -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)}.