diff options
| author | Martijn Coenen <maco@google.com> | 2013-01-10 15:53:06 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-01-10 15:53:06 -0800 |
| commit | d0cbbd5c676581626c98cb573b4b89acb7f539c4 (patch) | |
| tree | f091d282b446ed6d3c846299df48dea2c803b22d | |
| parent | 3859c5cccb202c20882fb3887cfa87babb1d85a3 (diff) | |
| parent | 959d40d8ce836c2cc6bca9cdcb81c211ee8a09cc (diff) | |
| download | android_packages_apps_Nfc-d0cbbd5c676581626c98cb573b4b89acb7f539c4.tar.gz android_packages_apps_Nfc-d0cbbd5c676581626c98cb573b4b89acb7f539c4.tar.bz2 android_packages_apps_Nfc-d0cbbd5c676581626c98cb573b4b89acb7f539c4.zip | |
Merge "Fix emergency_recovery logic."
| -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 d6b6aa5e..c95642f5 100644 --- a/nxp/jni/com_android_nfc_NativeNfcManager.cpp +++ b/nxp/jni/com_android_nfc_NativeNfcManager.cpp @@ -599,7 +599,7 @@ static int is_user_build() { * Performs a software reset */ void emergency_recovery(struct nfc_jni_native_data *nat) { - if (!is_user_build()) { + if (is_user_build()) { ALOGE("emergency_recovery: force restart of NFC service"); } else { // dont recover immediately, so we can debug |