diff options
| author | Martijn Coenen <maco@google.com> | 2013-09-04 00:48:20 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-09-04 00:48:20 +0000 |
| commit | f48416dede08b243c90738ec108a08041d7609c2 (patch) | |
| tree | 19332b23932c9426ec3d7d41d66d968770ee7033 /api/current.txt | |
| parent | d0688beb6890ca3888d08d250ad33655a2a588d5 (diff) | |
| parent | 5b1e032ea7c06ab11d778264dd950009fcb93cc5 (diff) | |
| download | frameworks_base-f48416dede08b243c90738ec108a08041d7609c2.zip frameworks_base-f48416dede08b243c90738ec108a08041d7609c2.tar.gz frameworks_base-f48416dede08b243c90738ec108a08041d7609c2.tar.bz2 | |
Merge "Reader mode NFC API: move to callback model." into klp-dev
Diffstat (limited to 'api/current.txt')
| -rw-r--r-- | api/current.txt | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/api/current.txt b/api/current.txt index 9e33ce0..7d06e1c 100644 --- a/api/current.txt +++ b/api/current.txt @@ -15202,7 +15202,7 @@ package android.nfc { method public void disableReaderMode(android.app.Activity); method public void enableForegroundDispatch(android.app.Activity, android.app.PendingIntent, android.content.IntentFilter[], java.lang.String[][]); method public deprecated void enableForegroundNdefPush(android.app.Activity, android.nfc.NdefMessage); - method public void enableReaderMode(android.app.Activity, int); + method public void enableReaderMode(android.app.Activity, android.nfc.NfcAdapter.ReaderCallback, int, android.os.Bundle); method public static android.nfc.NfcAdapter getDefaultAdapter(android.content.Context); method public boolean isEnabled(); method public boolean isNdefPushEnabled(); @@ -15218,12 +15218,14 @@ package android.nfc { field public static final java.lang.String EXTRA_ADAPTER_STATE = "android.nfc.extra.ADAPTER_STATE"; field public static final java.lang.String EXTRA_ID = "android.nfc.extra.ID"; 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_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 field public static final int FLAG_READER_SKIP_NDEF_CHECK = 128; // 0x80 field public static final int STATE_OFF = 1; // 0x1 field public static final int STATE_ON = 3; // 0x3 @@ -15243,6 +15245,10 @@ package android.nfc { method public abstract void onNdefPushComplete(android.nfc.NfcEvent); } + public static abstract interface NfcAdapter.ReaderCallback { + method public abstract void onTagDiscovered(android.nfc.Tag); + } + public final class NfcEvent { field public final android.nfc.NfcAdapter nfcAdapter; } |