diff options
| author | Yerriswamy <yerriswamy.kurubathayanna@nxp.com> | 2017-10-19 15:58:30 +0530 |
|---|---|---|
| committer | nxpandroid <srikrishna.pramoda@nxp.com> | 2017-11-24 11:44:34 +0530 |
| commit | 8aca387751a9caf69551db11a9bce620151ff538 (patch) | |
| tree | 9dd11870f4c6032b3514cb3647fe5e1e84933c6f | |
| parent | d8a71d2a82af02ffd52675e1d37bfab89a51fbbf (diff) | |
| download | android_vendor_nxp_opensource_packages_apps_Nfc-8aca387751a9caf69551db11a9bce620151ff538.tar.gz android_vendor_nxp_opensource_packages_apps_Nfc-8aca387751a9caf69551db11a9bce620151ff538.tar.bz2 android_vendor_nxp_opensource_packages_apps_Nfc-8aca387751a9caf69551db11a9bce620151ff538.zip | |
Corrected screen state condition checking
| -rwxr-xr-x | nci/jni/NativeNfcManager.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/nci/jni/NativeNfcManager.cpp b/nci/jni/NativeNfcManager.cpp index e387c782..a0ee86df 100755 --- a/nci/jni/NativeNfcManager.cpp +++ b/nci/jni/NativeNfcManager.cpp @@ -6061,13 +6061,13 @@ static void nfcManager_doSetScreenState (JNIEnv* e, jobject o, jint screen_state static void nfcManager_doSetScreenOrPowerState (JNIEnv* e, jobject o, jint state) { ALOGE("%s: Enter", __func__); - if (state <= NFA_SCREEN_STATE_ON_UNLOCKED ) // SCREEN_STATE + if ((state & NFA_SCREEN_STATE_MASK) <= NFA_SCREEN_STATE_ON_UNLOCKED ) // SCREEN_STATE nfcManager_doSetScreenState(e, o, state); - else if (state == VEN_POWER_STATE_ON) // POWER_ON NFC_OFF + else if ((state & NFA_SCREEN_STATE_MASK) == VEN_POWER_STATE_ON) // POWER_ON NFC_OFF { nfcManager_doSetNfcMode(e , o, NFC_MODE_OFF); } - else if (state == VEN_POWER_STATE_OFF) // POWER_OFF + else if ((state & NFA_SCREEN_STATE_MASK) == VEN_POWER_STATE_OFF) // POWER_OFF { if(sIsNfaEnabled) { |