diff options
| author | Martijn Coenen <maco@google.com> | 2014-04-15 21:00:09 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-04-15 21:00:09 +0000 |
| commit | 439d3a0ae0ef443147f64cabb745102eafc0e701 (patch) | |
| tree | b0b92d77e0656bd5ba22af2d88e0aee72d5a92c8 /nxp | |
| parent | 770529a4916d3b8a2982a9bb4f915b487dc2d56e (diff) | |
| parent | 4143f576a81fa0cba29718908dcb136a4642ef39 (diff) | |
| download | android_packages_apps_Nfc-439d3a0ae0ef443147f64cabb745102eafc0e701.tar.gz android_packages_apps_Nfc-439d3a0ae0ef443147f64cabb745102eafc0e701.tar.bz2 android_packages_apps_Nfc-439d3a0ae0ef443147f64cabb745102eafc0e701.zip | |
am 4143f576: am 780456b9: Merge "Fix thread deadlock issue - Removed the dependency"
* commit '4143f576a81fa0cba29718908dcb136a4642ef39':
Fix thread deadlock issue - Removed the dependency
Diffstat (limited to 'nxp')
| -rw-r--r-- | nxp/jni/com_android_nfc_NativeNfcManager.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nxp/jni/com_android_nfc_NativeNfcManager.cpp b/nxp/jni/com_android_nfc_NativeNfcManager.cpp index d99bda38..92ca65ac 100644 --- a/nxp/jni/com_android_nfc_NativeNfcManager.cpp +++ b/nxp/jni/com_android_nfc_NativeNfcManager.cpp @@ -1576,7 +1576,7 @@ static bool com_android_nfc_NfcManager_doSetTimeout( JNIEnv *e, jobject o, CONCURRENCY_LOCK(); if (timeout <= 0) { ALOGE("Timeout must be positive."); - return false; + success = false; } else { switch (tech) { case TARGET_TYPE_MIFARE_CLASSIC: |