summaryrefslogtreecommitdiffstats
path: root/api
diff options
context:
space:
mode:
authorMartijn Coenen <martijn.coenen@nxp.com>2011-01-18 11:38:28 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2011-01-18 11:38:28 -0800
commit3d06b1e0e954537254b87be55a4050e38351e527 (patch)
tree42cd83a57debffcab089633b2f3218ea3938aa16 /api
parent4707dc73e236b7055644401b73cd30164b7ad157 (diff)
parenta701cf85a0167a6bb623343388a7dca6f2b61ac5 (diff)
downloadframeworks_base-3d06b1e0e954537254b87be55a4050e38351e527.zip
frameworks_base-3d06b1e0e954537254b87be55a4050e38351e527.tar.gz
frameworks_base-3d06b1e0e954537254b87be55a4050e38351e527.tar.bz2
am a701cf85: Implement IsoDep timeout handling (API).
* commit 'a701cf85a0167a6bb623343388a7dca6f2b61ac5': Implement IsoDep timeout handling (API).
Diffstat (limited to 'api')
-rw-r--r--api/current.xml13
1 files changed, 13 insertions, 0 deletions
diff --git a/api/current.xml b/api/current.xml
index 6afec8c..35e0c44 100644
--- a/api/current.xml
+++ b/api/current.xml
@@ -103219,6 +103219,19 @@
<exception name="IOException" type="java.io.IOException">
</exception>
</method>
+<method name="setTimeout"
+ return="void"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="timeout" type="int">
+</parameter>
+</method>
</class>
<class name="MifareClassic"
extends="android.nfc.technology.BasicTagTechnology"