summaryrefslogtreecommitdiffstats
path: root/api
diff options
context:
space:
mode:
authorNick Pelly <npelly@google.com>2011-12-19 16:51:45 -0800
committerNick Pelly <npelly@google.com>2011-12-19 16:51:45 -0800
commit5f45cbac03aef1aaa4e6947c3a1188768343686a (patch)
treea8b7dee07861e44e21ccfaa3166f8d6c59cc24af /api
parenteca6d909f7dd990c9a3226aa2f1ed1fa0cd250a2 (diff)
downloadframeworks_base-5f45cbac03aef1aaa4e6947c3a1188768343686a.zip
frameworks_base-5f45cbac03aef1aaa4e6947c3a1188768343686a.tar.gz
frameworks_base-5f45cbac03aef1aaa4e6947c3a1188768343686a.tar.bz2
Fix build break - move API change from 15.txt to 16.txt
Change-Id: I3e7e2106424e00d696909c811ffe704ca8bffced
Diffstat (limited to 'api')
-rw-r--r--api/15.txt1
-rw-r--r--api/16.txt1
2 files changed, 1 insertions, 1 deletions
diff --git a/api/15.txt b/api/15.txt
index 687a4ce..ddf5baf 100644
--- a/api/15.txt
+++ b/api/15.txt
@@ -12659,6 +12659,7 @@ package android.nfc {
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 static android.nfc.NfcAdapter getDefaultAdapter(android.content.Context);
+ method public static deprecated android.nfc.NfcAdapter getDefaultAdapter();
method public boolean isEnabled();
method public void setNdefPushMessage(android.nfc.NdefMessage, android.app.Activity, android.app.Activity...);
method public void setNdefPushMessageCallback(android.nfc.NfcAdapter.CreateNdefMessageCallback, android.app.Activity, android.app.Activity...);
diff --git a/api/16.txt b/api/16.txt
index 6b41477..13fba29 100644
--- a/api/16.txt
+++ b/api/16.txt
@@ -12611,7 +12611,6 @@ package android.nfc {
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 static android.nfc.NfcAdapter getDefaultAdapter(android.content.Context);
- method public static deprecated android.nfc.NfcAdapter getDefaultAdapter();
method public boolean isEnabled();
method public void setNdefPushMessage(android.nfc.NdefMessage, android.app.Activity, android.app.Activity...);
method public void setNdefPushMessageCallback(android.nfc.NfcAdapter.CreateNdefMessageCallback, android.app.Activity, android.app.Activity...);