Merge "Unlink nfc hal death recipient when device shutdown"
diff --git a/src/adaptation/NfcAdaptation.cc b/src/adaptation/NfcAdaptation.cc
index 5c8b594..7c6a857 100644
--- a/src/adaptation/NfcAdaptation.cc
+++ b/src/adaptation/NfcAdaptation.cc
@@ -411,6 +411,9 @@
   } else if (mHal_1_1 != nullptr) {
     mHal_1_1->closeForPowerOffCase();
   }
+  if (mHal) {
+    mHal->unlinkToDeath(mNfcHalDeathRecipient);
+  }
 }
 
 /*******************************************************************************