diff options
| author | Martijn Coenen <maco@google.com> | 2014-09-12 02:20:53 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-09-12 02:20:53 +0000 |
| commit | 71bb7dc44204a93a6ec7136089449e1e50b2cae1 (patch) | |
| tree | 21d50eb7b0ef5797b4a5cb5f7018281186a1aeb1 /nci | |
| parent | 4db692d187951b1e9b92d5609509ad2fb85b8fa5 (diff) | |
| parent | 5ffc9d683d804f4c23d8bc19bfe105324dd61717 (diff) | |
| download | android_packages_apps_Nfc-71bb7dc44204a93a6ec7136089449e1e50b2cae1.tar.gz android_packages_apps_Nfc-71bb7dc44204a93a6ec7136089449e1e50b2cae1.tar.bz2 android_packages_apps_Nfc-71bb7dc44204a93a6ec7136089449e1e50b2cae1.zip | |
Merge "RoutingManager class shall properly handle RF-deactivate event." into lmp-dev
Diffstat (limited to 'nci')
| -rw-r--r-- | nci/jni/RoutingManager.cpp | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/nci/jni/RoutingManager.cpp b/nci/jni/RoutingManager.cpp index 3002458e..d5d944ea 100644 --- a/nci/jni/RoutingManager.cpp +++ b/nci/jni/RoutingManager.cpp @@ -30,6 +30,9 @@ extern "C" #include "nfa_ee_api.h" #include "nfa_ce_api.h" } +extern bool gActivated; +extern SyncEvent gDeactivatedEvent; + const JNINativeMethod RoutingManager::sMethods [] = { @@ -374,12 +377,18 @@ void RoutingManager::stackCallback (UINT8 event, tNFA_CONN_EVT_DATA* eventData) routingManager.notifyActivated(); } break; + case NFA_DEACTIVATED_EVT: case NFA_CE_DEACTIVATED_EVT: { + ALOGD("%s: NFA_DEACTIVATED_EVT, NFA_CE_DEACTIVATED_EVT", fn); routingManager.notifyDeactivated(); + SyncEventGuard g (gDeactivatedEvent); + gActivated = false; //guard this variable from multi-threaded access + gDeactivatedEvent.notifyOne (); } break; + case NFA_CE_DATA_EVT: { tNFA_CE_DATA& ce_data = eventData->ce_data; |