1 files changed, 12 insertions, 8 deletions
diff --git a/java/com/android/dialer/simulator/impl/SimulatorMainMenu.java b/java/com/android/dialer/simulator/impl/SimulatorMainMenu.java
index 1bf4b2a00..ba2b55802 100644
--- a/java/com/android/dialer/simulator/impl/SimulatorMainMenu.java
+++ b/java/com/android/dialer/simulator/impl/SimulatorMainMenu.java
@@ -65,16 +65,20 @@ final class SimulatorMainMenu {
                     EnrichedCallSimulatorActivity.newIntent(activity.getApplicationContext())))
         .addItem(
             "Enable simulator mode",
-            () ->
-                SimulatorComponent.get(activity.getApplicationContext())
-                    .getSimulator()
-                    .enableSimulatorMode())
+            () -> {
+              SimulatorComponent.get(activity.getApplicationContext())
+                  .getSimulator()
+                  .enableSimulatorMode();
+              SimulatorSimCallManager.register(activity.getApplicationContext());
+            })
         .addItem(
             "Disable simulator mode",
-            () ->
-                SimulatorComponent.get(activity.getApplicationContext())
-                    .getSimulator()
-                    .disableSimulatorMode());
+            () -> {
+              SimulatorComponent.get(activity.getApplicationContext())
+                  .getSimulator()
+                  .disableSimulatorMode();
+              SimulatorSimCallManager.unregister(activity.getApplicationContext());
+            });
     return simulatorSubMenu;
   }