summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartijn Coenen <maco@google.com>2012-10-05 10:48:45 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-10-05 10:48:45 -0700
commitb1ba0d2a520ee2c5543a2ae9e017e1ef424f9265 (patch)
treeafb227b0df5a16c62cc49c5ce2a9acb10d3dacbf
parentf4c1767b90eb6c256743d653e3ec451959bd399f (diff)
parent7bb9229c66e38ce9e3fbb8c5364ca3416e19c5bc (diff)
downloadpackages_apps_nfc-b1ba0d2a520ee2c5543a2ae9e017e1ef424f9265.zip
packages_apps_nfc-b1ba0d2a520ee2c5543a2ae9e017e1ef424f9265.tar.gz
packages_apps_nfc-b1ba0d2a520ee2c5543a2ae9e017e1ef424f9265.tar.bz2
am 7bb9229c: Merge "Increase default transceive timeout to SE to 30s." into jb-broadcom-nfc
* commit '7bb9229c66e38ce9e3fbb8c5364ca3416e19c5bc': Increase default transceive timeout to SE to 30s.
-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 55570a1..519c15b 100755
--- a/src/com/android/nfc/NfcService.java
+++ b/src/com/android/nfc/NfcService.java
@@ -1280,7 +1280,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 {