Merge "Revert "[MEP] psim->esim, don't skip carrierConfigChanged with subId -1"" into tm-qpr-dev

src/com/android/settings/network/UiccSlotUtil.java

@@ -140,8 +140,7 @@ public class UiccSlotUtil {
                         inactiveRemovableSlot,
                         /*removable sim's port Id*/ TelephonyManager.DEFAULT_PORT_INDEX,
                         excludedLogicalSlotIndex),
-                context,
-                /*isWaitingForValidSubId=*/ true);
+                context);
     }
 
     /**
@@ -179,8 +178,7 @@ public class UiccSlotUtil {
         performSwitchToSlot(telMgr,
                 prepareUiccSlotMappings(uiccSlotMappings, /*slot is not psim*/ false,
                         physicalSlotId, port, excludedLogicalSlotIndex),
-                context,
-                /*isWaitingForValidSubId=*/ false);
+                context);
     }
 
     /**
@@ -232,8 +230,7 @@ public class UiccSlotUtil {
     }
 
     private static void performSwitchToSlot(TelephonyManager telMgr,
-            Collection<UiccSlotMapping> uiccSlotMappings, Context context,
-            boolean isWaitingForValidSubId)
+            Collection<UiccSlotMapping> uiccSlotMappings, Context context)
             throws UiccSlotsException {
         CarrierConfigChangedReceiver receiver = null;
         long waitingTimeMillis =
@@ -243,7 +240,7 @@ public class UiccSlotUtil {
                         DEFAULT_WAIT_AFTER_SWITCH_TIMEOUT_MILLIS);
         try {
             CountDownLatch latch = new CountDownLatch(1);
-            receiver = new CarrierConfigChangedReceiver(latch, isWaitingForValidSubId);
+            receiver = new CarrierConfigChangedReceiver(latch);
             receiver.registerOn(context);
             telMgr.setSimSlotMapping(uiccSlotMappings);
             latch.await(waitingTimeMillis, TimeUnit.MILLISECONDS);