1 files changed, 9 insertions, 9 deletions
diff --git a/services/QualifiedNetworksService/src/com/android/telephony/qns/QnsComponents.java b/services/QualifiedNetworksService/src/com/android/telephony/qns/QnsComponents.java
index ad9a2e0..4d33f5a 100644
--- a/services/QualifiedNetworksService/src/com/android/telephony/qns/QnsComponents.java
+++ b/services/QualifiedNetworksService/src/com/android/telephony/qns/QnsComponents.java
@@ -77,10 +77,6 @@ class QnsComponents {
         mCellularQualityMonitors.put(
                 slotId,
                 new CellularQualityMonitor(mContext, mQnsTelephonyListeners.get(slotId), slotId));
-        mQnsCallStatusTracker.put(
-                slotId,
-                new QnsCallStatusTracker(mQnsTelephonyListeners.get(slotId), slotId));
-
         mQnsProvisioningListeners.put(
                 slotId, new QnsProvisioningListener(mContext, mQnsImsManagers.get(slotId), slotId));
         mQnsEventDispatchers.put(
@@ -93,6 +89,10 @@ class QnsComponents {
         mQnsCarrierConfigManagers.put(
                 slotId,
                 new QnsCarrierConfigManager(mContext, mQnsEventDispatchers.get(slotId), slotId));
+        mQnsCallStatusTracker.put(
+                slotId,
+                new QnsCallStatusTracker(mQnsTelephonyListeners.get(slotId),
+                        mQnsCarrierConfigManagers.get(slotId), slotId));
         mWifiBackhaulMonitors.put(
                 slotId,
                 new WifiBackhaulMonitor(
@@ -238,6 +238,11 @@ class QnsComponents {
             mWifiBackhaulMonitors.remove(slotId);
             wifiBackhaulMonitor.close();
         }
+        QnsCallStatusTracker qnsCallStatusTracker = mQnsCallStatusTracker.get(slotId);
+        if (qnsCallStatusTracker != null) {
+            mQnsCallStatusTracker.remove(slotId);
+            qnsCallStatusTracker.close();
+        }
         QnsCarrierConfigManager qnsCarrierConfigManager = mQnsCarrierConfigManagers.get(slotId);
         if (qnsCarrierConfigManager != null) {
             mQnsCarrierConfigManagers.remove(slotId);
@@ -253,11 +258,6 @@ class QnsComponents {
             mQnsProvisioningListeners.remove(slotId);
             qnsProvisioningListener.close();
         }
-        QnsCallStatusTracker qnsCallStatusTracker = mQnsCallStatusTracker.get(slotId);
-        if (qnsCallStatusTracker != null) {
-            mQnsCallStatusTracker.remove(slotId);
-            qnsCallStatusTracker.close();
-        }
         CellularQualityMonitor cellularQualityMonitor = mCellularQualityMonitors.get(slotId);
         if (cellularQualityMonitor != null) {
             mCellularQualityMonitors.remove(slotId);