commit 8c573dc72a2a2c5580233049977cdde70d7b9479
author Ruchi Kandoi <kandoiruchi@google.com> Wed Jan 31 16:49:22 2018 -0800
committer Ruchi Kandoi <kandoiruchi@google.com> Tue Mar 13 14:35:01 2018 -0700
tree f88b91e3d56f4bf425498ffc2d9d0ba21db63f97
parent d80d5f972e02eb66a3239ed938135dd516c2f2af

Clear HCI Network information on HCI_NETWORK_RESET Event

Test: None
Bug: 72746517
Change-Id: I586690aed7a689dab345d005027a090bbc8dc00f

src/nfc/nfc/nfc_main.cc

diff --git a/src/nfc/nfc/nfc_main.cc b/src/nfc/nfc/nfc_main.cc
index 0fd4a04..77c0485 100644
--- a/src/nfc/nfc/nfc_main.cc
+++ b/src/nfc/nfc/nfc_main.cc
@@ -26,6 +26,7 @@
 #include <string.h>
 
 #include <android-base/stringprintf.h>
+#include <android/hardware/nfc/1.1/types.h>
 #include <base/logging.h>
 
 #include "nfc_target.h"
@@ -55,8 +56,10 @@
 #endif /* NFC_RW_ONLY */
 
 using android::base::StringPrintf;
+using android::hardware::nfc::V1_1::NfcEvent;
 
 extern bool nfc_debug_enabled;
+extern void delete_stack_non_volatile_store(bool forceDelete);
 
 /****************************************************************************
 ** Declarations
@@ -145,6 +148,8 @@
       return "HAL_NFC_RELEASE_CONTROL_EVT";
     case HAL_NFC_ERROR_EVT:
       return "HAL_NFC_ERROR_EVT";
+    case (uint32_t)NfcEvent::HCI_NETWORK_RESET:
+      return "HCI_NETWORK_RESET";
     default:
       return "???? UNKNOWN EVENT";
   }
@@ -482,6 +487,10 @@
           }
           break;
 
+        case (uint32_t)NfcEvent::HCI_NETWORK_RESET:
+          delete_stack_non_volatile_store(true);
+          break;
+
         default:
           break;
       }
@@ -582,6 +591,7 @@
     case HAL_NFC_REQUEST_CONTROL_EVT:
     case HAL_NFC_RELEASE_CONTROL_EVT:
     case HAL_NFC_ERROR_EVT:
+    case (uint32_t)NfcEvent::HCI_NETWORK_RESET:
       nfc_main_post_hal_evt(event, status);
       break;