diff options
| author | Steve Kondik <shade@chemlab.org> | 2013-02-12 22:42:37 -0800 |
|---|---|---|
| committer | Steve Kondik <shade@chemlab.org> | 2013-02-12 22:42:37 -0800 |
| commit | 90868bd91fd3829bb0006c377da12a651f95716b (patch) | |
| tree | 45af77d7a5a35f853005019c0d00958a5e027c17 /nci/jni/PeerToPeer.cpp | |
| parent | f3b413c98dd08327dafa564a10c17c84beac7b8f (diff) | |
| parent | be1939b4b6003ac7a65fcb95a3912f5e1ce8e75f (diff) | |
| download | packages_apps_nfc-90868bd91fd3829bb0006c377da12a651f95716b.zip packages_apps_nfc-90868bd91fd3829bb0006c377da12a651f95716b.tar.gz packages_apps_nfc-90868bd91fd3829bb0006c377da12a651f95716b.tar.bz2 | |
Merge tag 'android-4.2.2_r1' of https://android.googlesource.com/platform/packages/apps/Nfc into 1.1
Android 4.2.2 release 1
Diffstat (limited to 'nci/jni/PeerToPeer.cpp')
| -rw-r--r-- | nci/jni/PeerToPeer.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nci/jni/PeerToPeer.cpp b/nci/jni/PeerToPeer.cpp index 7994e2a..b40e366 100644 --- a/nci/jni/PeerToPeer.cpp +++ b/nci/jni/PeerToPeer.cpp @@ -1431,9 +1431,9 @@ void PeerToPeer::nfaClientCallback (tNFA_P2P_EVT p2pEvent, tNFA_P2P_EVT_DATA* ev if ((pConn = sP2p.findConnection(eventData->disc.handle)) == NULL) { // If no connection, may be a client that is trying to connect - if ((pClient = sP2p.findClientCon ((tNFA_HANDLE)NFA_HANDLE_INVALID)) == NULL) + if ((pClient = sP2p.findClient (eventData->disc.handle)) == NULL) { - ALOGE ("%s: NFA_P2P_DISC_EVT: can't find conn for NFA handle: 0x%04x", fn, eventData->disc.handle); + ALOGE ("%s: NFA_P2P_DISC_EVT: can't find client for NFA handle: 0x%04x", fn, eventData->disc.handle); return; } // Unblock createDataLinkConn() |