summaryrefslogtreecommitdiffstats
path: root/api
diff options
context:
space:
mode:
authorMartijn Coenen <maco@google.com>2013-09-10 10:13:14 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-09-10 10:13:14 -0700
commit468b6e753f331551c25d4edf38e496bb57bc1265 (patch)
tree4ceb7ef625e79acb54646b2fe723ab41366f35ca /api
parent83fa7d08c59c63511e8de4c12b8a89e69fcf06b8 (diff)
parent6343075fbf1fef40d421d060b807e8cbc08849cf (diff)
downloadframeworks_base-468b6e753f331551c25d4edf38e496bb57bc1265.zip
frameworks_base-468b6e753f331551c25d4edf38e496bb57bc1265.tar.gz
frameworks_base-468b6e753f331551c25d4edf38e496bb57bc1265.tar.bz2
am 6343075f: am 9720d5e1: Merge "Remove legacy HCE APIs." into klp-dev
* commit '6343075fbf1fef40d421d060b807e8cbc08849cf': Remove legacy HCE APIs.
Diffstat (limited to 'api')
-rw-r--r--api/current.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/api/current.txt b/api/current.txt
index 04882fb..73bcc75 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -15304,7 +15304,7 @@ package android.nfc.cardemulation {
method public final void notifyUnhandled();
method public final android.os.IBinder onBind(android.content.Intent);
method public abstract void onDeactivated(int);
- method public byte[] processCommandApdu(byte[], android.os.Bundle);
+ method public abstract byte[] processCommandApdu(byte[], android.os.Bundle);
method public final void sendResponseApdu(byte[]);
field public static final int DEACTIVATION_DESELECTED = 1; // 0x1
field public static final int DEACTIVATION_LINK_LOSS = 0; // 0x0