From 3a0ae431d5ae96a29686306f114ca77312d13356 Mon Sep 17 00:00:00 2001
From: Mike Cailean <mcailean@codeaurora.org>
Date: Fri, 15 Mar 2019 12:54:02 -0700
Subject: [PATCH] Add unlink for corresponding link in measurements for GNSS
 HIDL 2.0

Change-Id: I7423ed1c515745f2f4a0ea4f5495e86eea4de0ee
CRs-fixed: 2417264
---
 android/2.0/GnssMeasurement.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/android/2.0/GnssMeasurement.cpp b/android/2.0/GnssMeasurement.cpp
index 48dabf35..721a48c3 100644
--- a/android/2.0/GnssMeasurement.cpp
+++ b/android/2.0/GnssMeasurement.cpp
@@ -91,6 +91,10 @@ Return<void> GnssMeasurement::close()  {
         mGnssMeasurementCbIface_1_1->unlinkToDeath(mGnssMeasurementDeathRecipient);
         mGnssMeasurementCbIface_1_1 = nullptr;
     }
+    if (mGnssMeasurementCbIface_2_0 != nullptr) {
+        mGnssMeasurementCbIface_2_0->unlinkToDeath(mGnssMeasurementDeathRecipient);
+        mGnssMeasurementCbIface_2_0 = nullptr;
+    }
     mApi->measurementClose();
 
     return Void();