diff options
author | Jason parks <jparks@google.com> | 2011-05-24 13:49:51 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-05-24 13:49:51 -0700 |
commit | e372c17ba76163018cbc1b6972c9e6b0a8a8b5f4 (patch) | |
tree | 8cdcec2ee21187d5fbd9d2cd43a92ac11bfca61b /api | |
parent | 4b4e3a0b216d146a78b2e2e5ab9593846e805bce (diff) | |
parent | 01425365a85e605139f612502f68954cad869e5b (diff) | |
download | frameworks_base-e372c17ba76163018cbc1b6972c9e6b0a8a8b5f4.zip frameworks_base-e372c17ba76163018cbc1b6972c9e6b0a8a8b5f4.tar.gz frameworks_base-e372c17ba76163018cbc1b6972c9e6b0a8a8b5f4.tar.bz2 |
Merge "Add public API to do NDEF push."
Diffstat (limited to 'api')
-rw-r--r-- | api/current.txt | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt index 82e2ffd..678e454 100644 --- a/api/current.txt +++ b/api/current.txt @@ -11643,6 +11643,7 @@ package android.nfc { method public void disableForegroundNdefPush(android.app.Activity); method public void enableForegroundDispatch(android.app.Activity, android.app.PendingIntent, android.content.IntentFilter[], java.lang.String[][]); method public void enableForegroundNdefPush(android.app.Activity, android.nfc.NdefMessage); + method public void enableForegroundNdefPush(android.app.Activity, android.nfc.NfcAdapter.NdefPushCallback); method public static android.nfc.NfcAdapter getDefaultAdapter(android.content.Context); method public static deprecated android.nfc.NfcAdapter getDefaultAdapter(); method public boolean isEnabled(); @@ -11654,6 +11655,11 @@ package android.nfc { field public static final java.lang.String EXTRA_TAG = "android.nfc.extra.TAG"; } + public static abstract interface NfcAdapter.NdefPushCallback { + method public abstract android.nfc.NdefMessage createMessage(); + method public abstract void onMessagePushed(); + } + public final class NfcManager { method public android.nfc.NfcAdapter getDefaultAdapter(); } |