diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-04-13 05:22:22 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-13 05:22:22 +0000 |
| commit | 3a6baa1fcb6098b546b89b56e423cb863ef71c94 (patch) | |
| tree | cd0ec1c46249fd107e34cb603becd27df6fabfd2 /nci | |
| parent | 368a671e9f69dcb76ec9a4334c28d5144fa3e56e (diff) | |
| parent | 3f7592657b662830682faa2d8b0a82a9d635a19e (diff) | |
| download | Nfc-3a6baa1fcb6098b546b89b56e423cb863ef71c94.tar.gz | |
Merge "Unblock wait events when nci command timeout occurs" am: e1edb01e73 am: 46dfe1be91 am: 3f7592657b
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Nfc/+/1667085
Change-Id: Ie931ba666d5b189e5743e77ac1fc6e2c20a413dc
Diffstat (limited to 'nci')
| -rw-r--r-- | nci/jni/NativeNfcManager.cpp | 25 |
1 files changed, 24 insertions, 1 deletions
diff --git a/nci/jni/NativeNfcManager.cpp b/nci/jni/NativeNfcManager.cpp index 9329d9fa..28ae464a 100644 --- a/nci/jni/NativeNfcManager.cpp +++ b/nci/jni/NativeNfcManager.cpp @@ -862,6 +862,24 @@ void nfaDeviceManagementCallback(uint8_t dmEvent, android::gCachedNfcManagerNotifyHwErrorReported); { DLOG_IF(INFO, nfc_debug_enabled) << StringPrintf( + "%s: aborting sNfaEnableDisablePollingEvent", __func__); + SyncEventGuard guard(sNfaEnableDisablePollingEvent); + sNfaEnableDisablePollingEvent.notifyOne(); + } + { + DLOG_IF(INFO, nfc_debug_enabled) + << StringPrintf("%s: aborting sNfaEnableEvent", __func__); + SyncEventGuard guard(sNfaEnableEvent); + sNfaEnableEvent.notifyOne(); + } + { + DLOG_IF(INFO, nfc_debug_enabled) + << StringPrintf("%s: aborting sNfaDisableEvent", __func__); + SyncEventGuard guard(sNfaDisableEvent); + sNfaDisableEvent.notifyOne(); + } + { + DLOG_IF(INFO, nfc_debug_enabled) << StringPrintf( "%s: aborting sNfaSetPowerSubState", __func__); SyncEventGuard guard(sNfaSetPowerSubState); sNfaSetPowerSubState.notifyOne(); @@ -872,7 +890,12 @@ void nfaDeviceManagementCallback(uint8_t dmEvent, SyncEventGuard guard(sNfaSetConfigEvent); sNfaSetConfigEvent.notifyOne(); } - + { + DLOG_IF(INFO, nfc_debug_enabled) << StringPrintf( + "%s: aborting sNfaGetConfigEvent", __func__); + SyncEventGuard guard(sNfaGetConfigEvent); + sNfaGetConfigEvent.notifyOne(); + } } else { nativeNfcTag_abortWaits(); NfcTag::getInstance().abort(); |