summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartijn Coenen <maco@google.com>2012-10-05 10:47:38 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-10-05 10:47:38 -0700
commit7bb9229c66e38ce9e3fbb8c5364ca3416e19c5bc (patch)
tree33756c98d9fc3da41f24cd0987549ad19d860d41
parent10dd44d39824fbccd8bf26871cb118b1475eb2f1 (diff)
parent07d1b6ea9f46d7118103cd0821ef7c86bfa9ee43 (diff)
downloadpackages_apps_nfc-7bb9229c66e38ce9e3fbb8c5364ca3416e19c5bc.zip
packages_apps_nfc-7bb9229c66e38ce9e3fbb8c5364ca3416e19c5bc.tar.gz
packages_apps_nfc-7bb9229c66e38ce9e3fbb8c5364ca3416e19c5bc.tar.bz2
Merge "Increase default transceive timeout to SE to 30s." into jb-broadcom-nfc
-rwxr-xr-xsrc/com/android/nfc/NfcService.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/nfc/NfcService.java b/src/com/android/nfc/NfcService.java
index 3acfa1c..62512e5 100755
--- a/src/com/android/nfc/NfcService.java
+++ b/src/com/android/nfc/NfcService.java
@@ -1287,7 +1287,7 @@ public class NfcService extends Application implements DeviceHostListener {
if (handle == 0) {
throw new IOException("NFC EE failed to open");
}
- mDeviceHost.setTimeout(TagTechnology.ISO_DEP, 10000);
+ mDeviceHost.setTimeout(TagTechnology.ISO_DEP, 30000);
mOpenEe = new OpenSecureElement(getCallingPid(), handle, b);
try {