Merge "set connection state after adding NonSimulatorConnectionListener and set connection to active at the end." am: ac3d0e58f1
am: 2b310bbf73

Change-Id: I1b5aad804450606b4453cd3c7ec7071fcd8cc585
diff --git a/java/com/android/dialer/simulator/impl/SimulatorConnectionService.java b/java/com/android/dialer/simulator/impl/SimulatorConnectionService.java
index 19104be..8430e24 100644
--- a/java/com/android/dialer/simulator/impl/SimulatorConnectionService.java
+++ b/java/com/android/dialer/simulator/impl/SimulatorConnectionService.java
@@ -84,7 +84,6 @@
       return null;
     }
     SimulatorConnection connection = new SimulatorConnection(this, request);
-    connection.setDialing();
     if (SimulatorSimCallManager.isSimulatorConnectionRequest(request)) {
       simulatorConnectionsBank.add(connection);
       connection.setAddress(
@@ -92,6 +91,7 @@
           request
               .getExtras()
               .getInt(Simulator.PRESENTATION_CHOICE, TelecomManager.PRESENTATION_ALLOWED));
+      connection.setDialing();
       ThreadUtil.postOnUiThread(
           () ->
               SimulatorComponent.get(instance)
@@ -107,6 +107,8 @@
       connection.putExtras(extras);
       simulatorConnectionsBank.add(connection);
       connection.addListener(new NonSimulatorConnectionListener());
+      connection.setDialing();
+      ThreadUtil.postOnUiThread(connection::setActive);
     }
     return connection;
   }