commit 0adb7094201a0a20a6c2ac5ab9816ff7e5fb5fd7
author Sundarajan Srinivasan <sundarsrini@google.com> Tue Mar 17 11:58:50 2020 -0700
committer Sundarajan Srinivasan <sundarsrini@google.com> Tue Mar 17 12:05:34 2020 -0700
tree 2cd58e10ce7ef7908b93225954547d163202e3bf
parent 61d1b776de67a1559d0b38513c55f1acbd45a47f

Set sRemotePassiveRendezvousServer to NULL during shutdown

Since sRemotePassiveRendezvousServer is not reset, the weavestack
isnt shutdown cleanly. Set the var to NULL to shutdown the stack properly.

Bug: 47588
Test: Verified weavestack shutdown works cleanly.

Change-Id: Ib85c27225f3391b390ddae0caf0431c8dec4e6b1

src/lib/profiles/device-control/DeviceControl.cpp

diff --git a/src/lib/profiles/device-control/DeviceControl.cpp b/src/lib/profiles/device-control/DeviceControl.cpp
index cfa1938..9642f44 100644
--- a/src/lib/profiles/device-control/DeviceControl.cpp
+++ b/src/lib/profiles/device-control/DeviceControl.cpp
@@ -132,6 +132,8 @@
     mFailSafeArmed = false;
     mResetFlags = 0x0000;
 
+    sRemotePassiveRendezvousServer = NULL;
+
     // Kill any pending or completed Remote Passive Rendezvous.
     CloseRemotePassiveRendezvous();