Merge pull request #45 from DimiL/bug_1050621

Bug 1050621 - [NFC] sometimes nfcd stuck when transfer files from androi.d device to flame. r=allstars.chh

src/NfcService.cpp

@@ -188,14 +188,6 @@ void NfcService::handleLlcpLinkDeactivation(NfcEvent* event)
 
   mP2pLinkManager->onLlcpDeactivated();
   mMsgHandler->processNotification(NFC_NOTIFICATION_TECH_LOST, NULL);
-
-  // TODO : Handle in SE related code in the future ?
-  // Bug 961667 - [NFC] Multiple pairing when tapped phones together
-  // RF field should be reset when link deactivate.
-  ALOGD("%s: reset RF field", FUNC);
-  if (mState != STATE_NFC_OFF) {
-    sNfcManager->resetRFField();
-  }
 }
 
 void NfcService::handleLlcpLinkActivation(NfcEvent* event)

src/interface/INfcManager.h

@@ -159,8 +159,6 @@ class INfcManager {
    */
   virtual int getDefaultLlcpRwSize() const = 0;
 
-  virtual void resetRFField() = 0;
-
   /**
    * NFC controller starts routing data in listen mode.
    *

src/nci/NfcManager.cpp

@@ -431,13 +431,6 @@ void NfcManager::setP2pTargetModes(int modes)
   // This function is not called by the NFC service nor exposed by public API.
 }
 
-// TODO : Handle in SE
-void NfcManager::resetRFField()
-{
-  startRfDiscovery(false);
-  startRfDiscovery(true);
-}
-
 bool NfcManager::doSelectSecureElement()
 {
   bool result = true;

src/nci/NfcManager.h

@@ -169,8 +169,6 @@ class NfcManager
    */
   int getDefaultLlcpRwSize() const { return NfcManager::DEFAULT_LLCP_RWSIZE; };
 
-  void resetRFField();
-
   /**
    * NFC controller starts routing data in listen mode.
    *