diff options
| author | Martijn Coenen <maco@google.com> | 2013-10-01 12:24:42 -0700 |
|---|---|---|
| committer | Martijn Coenen <maco@google.com> | 2013-10-01 12:24:42 -0700 |
| commit | 5b60927762b8512622e5a1d53b93a4b3b49acba2 (patch) | |
| tree | cc9beb22340dab21396a447bc4c5f449f41551a7 | |
| parent | efb7a3df560585994cebd40fcf5ffbc864f8c358 (diff) | |
| download | android_packages_apps_Nfc-5b60927762b8512622e5a1d53b93a4b3b49acba2.tar.gz android_packages_apps_Nfc-5b60927762b8512622e5a1d53b93a4b3b49acba2.tar.bz2 android_packages_apps_Nfc-5b60927762b8512622e5a1d53b93a4b3b49acba2.zip | |
Notify NfcService on NFA_DEACTIVATED_EVT.
This event comes when the remote puts us to sleep;
we should notify NfcService in this scenario as well,
so that NfcService in turn can notify HCE applications.
Bug: 10681671
Change-Id: Ice7f33c3385d40793df6f2c5c900ff6d4e7640f3
| -rw-r--r-- | nci/jni/RoutingManager.cpp | 1 | ||||
| -rw-r--r-- | src/com/android/nfc/cardemulation/RegisteredAidCache.java | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/nci/jni/RoutingManager.cpp b/nci/jni/RoutingManager.cpp index 8b0a178a..83e97d0a 100644 --- a/nci/jni/RoutingManager.cpp +++ b/nci/jni/RoutingManager.cpp @@ -251,6 +251,7 @@ void RoutingManager::stackCallback (UINT8 event, tNFA_CONN_EVT_DATA* eventData) routingManager.notifyActivated(); } break; + case NFA_DEACTIVATED_EVT: case NFA_CE_DEACTIVATED_EVT: { routingManager.notifyDeactivated(); diff --git a/src/com/android/nfc/cardemulation/RegisteredAidCache.java b/src/com/android/nfc/cardemulation/RegisteredAidCache.java index f6c14184..165e53b6 100644 --- a/src/com/android/nfc/cardemulation/RegisteredAidCache.java +++ b/src/com/android/nfc/cardemulation/RegisteredAidCache.java @@ -198,7 +198,6 @@ public class RegisteredAidCache implements RegisteredServicesCache.Callback { // broadcasts are delayed by 10 seconds in that scenario, which causes // calls to our APIs referencing that service to fail. // Hence, update the cache in case we don't know about the service. - if (DBG) Log.d(TAG, "Didn't find passed in service, invalidating cache."); serviceFound = mServiceCache.hasService(userId, service); } if (!serviceFound) { |