diff options
| author | Sunil Jogi <sunil.jogi@nxp.com> | 2012-04-10 12:43:49 -0700 |
|---|---|---|
| committer | Martijn Coenen <maco@google.com> | 2012-04-20 12:14:29 -0700 |
| commit | 16c9bd97838d7004f39269290b8a3c147d90d1c7 (patch) | |
| tree | 87da85ef4abe72d0f8f3c9357a728d7d4fbe1f7c /jni | |
| parent | 9cf867ea8bc3d21d9ecb550c9b0e654f6b3fd9e1 (diff) | |
| download | packages_apps_nfc-16c9bd97838d7004f39269290b8a3c147d90d1c7.zip packages_apps_nfc-16c9bd97838d7004f39269290b8a3c147d90d1c7.tar.gz packages_apps_nfc-16c9bd97838d7004f39269290b8a3c147d90d1c7.tar.bz2 | |
Added delay before NFC system recovery
Added delay before NFC system recovery if SE is in wired mode to
complete possible pending transaction.
Change-Id: I74f04e6d66342b94184083141c5d62341bdf209b
Diffstat (limited to 'jni')
| -rw-r--r-- | jni/com_android_nfc.cpp | 1 | ||||
| -rw-r--r-- | jni/com_android_nfc_NativeNfcManager.cpp | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/jni/com_android_nfc.cpp b/jni/com_android_nfc.cpp index fdfd656..d794d6e 100644 --- a/jni/com_android_nfc.cpp +++ b/jni/com_android_nfc.cpp @@ -68,6 +68,7 @@ JNIEnv *nfc_get_env() JNIEnv *e; if (vm->GetEnv((void **)&e, JNI_VERSION_1_6) != JNI_OK) { ALOGE("Current thread is not attached to VM"); + phLibNfc_Mgt_Recovery(); abort(); } return e; diff --git a/jni/com_android_nfc_NativeNfcManager.cpp b/jni/com_android_nfc_NativeNfcManager.cpp index 298b087..f616919 100644 --- a/jni/com_android_nfc_NativeNfcManager.cpp +++ b/jni/com_android_nfc_NativeNfcManager.cpp @@ -608,6 +608,7 @@ void emergency_recovery(struct nfc_jni_native_data *nat) { sleep(t); } } + phLibNfc_Mgt_Recovery(); abort(); // force a noisy crash } |