diff options
| author | Martijn Coenen <maco@google.com> | 2013-09-12 13:44:39 +0200 |
|---|---|---|
| committer | Martijn Coenen <maco@google.com> | 2013-09-12 13:44:39 +0200 |
| commit | b523bfa64d9304ef22d563f81defa48b047c623a (patch) | |
| tree | 21f010154e1a110ffe157477f1892432ec170f97 | |
| parent | 58d2065984646a61145df285d1c77b68b1f700fb (diff) | |
| download | frameworks_base-b523bfa64d9304ef22d563f81defa48b047c623a.zip frameworks_base-b523bfa64d9304ef22d563f81defa48b047c623a.tar.gz frameworks_base-b523bfa64d9304ef22d563f81defa48b047c623a.tar.bz2 | |
Rename FLAG_READER_NFC_KOVIO to FLAG_READER_NFC_BARCODE.
Bug: 10722206
Change-Id: I8b672cd7b9015e1ec88af96ef1fd0774d20b8d17
| -rw-r--r-- | api/current.txt | 2 | ||||
| -rw-r--r-- | core/java/android/nfc/NfcAdapter.java | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/api/current.txt b/api/current.txt index 3c4555f..a53ace8 100644 --- a/api/current.txt +++ b/api/current.txt @@ -15193,9 +15193,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 diff --git a/core/java/android/nfc/NfcAdapter.java b/core/java/android/nfc/NfcAdapter.java index 2a18900..486e75a 100644 --- a/core/java/android/nfc/NfcAdapter.java +++ b/core/java/android/nfc/NfcAdapter.java @@ -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)}. |