3 files changed, 6 insertions, 3 deletions
diff --git a/services/QualifiedNetworksService/src/com/android/telephony/qns/IwlanNetworkStatusTracker.java b/services/QualifiedNetworksService/src/com/android/telephony/qns/IwlanNetworkStatusTracker.java
index 8175a2a..1377077 100644
--- a/services/QualifiedNetworksService/src/com/android/telephony/qns/IwlanNetworkStatusTracker.java
+++ b/services/QualifiedNetworksService/src/com/android/telephony/qns/IwlanNetworkStatusTracker.java
@@ -394,11 +394,11 @@ class IwlanNetworkStatusTracker {
         Log.d(sLogTag, "notifyIwlanNetworkStatus for slot: " + slotId);
         IwlanAvailabilityInfo info = makeIwlanAvailabilityInfo(slotId);
         if (!info.getIwlanAvailable() && notifyIwlanDisabled) {
-            Log.d(sLogTag, "setNotifyIwlanDisabled");
+            Log.d(sLogTag, "setNotifyIwlanDisabled for slot: " + slotId);
             info.setNotifyIwlanDisabled();
         }
         if (!info.equals(mLastIwlanAvailabilityInfo.get(slotId))) {
-            Log.d(sLogTag, "notify updated info");
+            Log.d(sLogTag, "notify updated info for slot: " + slotId);
             if (mIwlanNetworkListenersArray.get(slotId) != null) {
                 mIwlanNetworkListenersArray.get(slotId).notifyResult(info);
             }
diff --git a/services/QualifiedNetworksService/src/com/android/telephony/qns/QnsComponents.java b/services/QualifiedNetworksService/src/com/android/telephony/qns/QnsComponents.java
index 4d33f5a..1c9b898 100644
--- a/services/QualifiedNetworksService/src/com/android/telephony/qns/QnsComponents.java
+++ b/services/QualifiedNetworksService/src/com/android/telephony/qns/QnsComponents.java
@@ -275,7 +275,7 @@ class QnsComponents {
         }
         QnsImsManager qnsImsManager = mQnsImsManagers.get(slotId);
         if (qnsImsManager != null) {
-            mQnsTelephonyListeners.remove(slotId);
+            mQnsImsManagers.remove(slotId);
             qnsImsManager.close();
         }
         QnsTelephonyListener qnsTelephonyListener = mQnsTelephonyListeners.get(slotId);
diff --git a/services/QualifiedNetworksService/src/com/android/telephony/qns/QnsTelephonyListener.java b/services/QualifiedNetworksService/src/com/android/telephony/qns/QnsTelephonyListener.java
index 51414e1..32883d4 100644
--- a/services/QualifiedNetworksService/src/com/android/telephony/qns/QnsTelephonyListener.java
+++ b/services/QualifiedNetworksService/src/com/android/telephony/qns/QnsTelephonyListener.java
@@ -364,6 +364,7 @@ class QnsTelephonyListener {
      * @param h the handler to get event.
      */
     void unregisterCallStateChanged(Handler h) {
+        log("unregisterCallStateChanged");
         if (h != null) {
             mCallStateListener.remove(h);
         }
@@ -387,6 +388,7 @@ class QnsTelephonyListener {
      * @param h the handler to get event.
      */
     void unregisterSubscriptionIdChanged(Handler h) {
+        log("unregisterSubscriptionIdChanged");
         if (h != null) {
             mSubscriptionIdListener.remove(h);
         }
@@ -398,6 +400,7 @@ class QnsTelephonyListener {
      * @param h the handler to get event.
      */
     void unregisterIwlanServiceStateChanged(Handler h) {
+        log("unregisterIwlanServiceStateChanged");
         if (h != null) {
             mIwlanServiceStateListener.remove(h);
         }