commit 259abdcbb35206e0ae728d516d01c4892367bee6
author Elliott Hughes <enh@google.com> Fri Nov 22 17:37:24 2013 -0800
committer Android Git Automerger <android-git-automerger@android.com> Fri Nov 22 17:37:24 2013 -0800
tree 9c2aef089298f1a802a13a88b9dfe2e1a564b431
parent 9e987ccb716624d658f98abc7db2097e11e3d8ed
parent b4564787a7f8b5e7b9a0147c40a5bf2e83125424

am b4564787: Merge "Remove a dependency on a device-kernel-specific header."

* commit 'b4564787a7f8b5e7b9a0147c40a5bf2e83125424':
  Remove a dependency on a device-kernel-specific header.

src/phHal4Nfc_ADD.c

diff --git a/src/phHal4Nfc_ADD.c b/src/phHal4Nfc_ADD.c
index 727b7c4..d2040ea 100644
--- a/src/phHal4Nfc_ADD.c
+++ b/src/phHal4Nfc_ADD.c
@@ -493,13 +493,10 @@
                             Count++;
                         }
                     }
-                    if ( !(Sak & NFCIP_BITMASK) )
-                    {
-                        // Always add a separate 3A target on a separate
-                        // handle, so the upper layers can connect to it.
-                        aRemoteDevTypes[Count] = phHal_eISO14443_3A_PICC;
-                        Count++;
-                    }
+                    // Always add a separate 3A target on a separate
+                    // handle, so the upper layers can connect to it.
+                    aRemoteDevTypes[Count] = phHal_eISO14443_3A_PICC;
+                    Count++;
                 }
                 /*Check for P2P target passive*/
                 if((Sak & NFCIP_BITMASK) && 

src/phHal4Nfc_Reader.c

diff --git a/src/phHal4Nfc_Reader.c b/src/phHal4Nfc_Reader.c
index f27bb09..526d0fc 100644
--- a/src/phHal4Nfc_Reader.c
+++ b/src/phHal4Nfc_Reader.c
@@ -237,6 +237,11 @@
         }
 
     }
+    if(NFCSTATUS_PENDING != RetStatus)
+    {
+        Hal4Ctxt->sUpperLayerInfo.psUpperLayerCtxt = NULL;
+        Hal4Ctxt->sTgtConnectInfo.pUpperConnectCb = NULL;
+    }
     return RetStatus;
 }