Android and Xamarin test controller fixes and improvements

1 files changed, 2 insertions, 7 deletions

diff --git a/csharp/test/xamarin/controller.iOS/AppDelegate.cs b/csharp/test/xamarin/controller.iOS/AppDelegate.cs
index 1f4728470ab..2b79fae00b1 100644
--- a/csharp/test/xamarin/controller.iOS/AppDelegate.cs
+++ b/csharp/test/xamarin/controller.iOS/AppDelegate.cs
@@ -48,17 +48,12 @@ namespace controller.iOS
 
         public bool isEmulator()
         {
-            return true;
+            return ObjCRuntime.Runtime.Arch == ObjCRuntime.Arch.SIMULATOR;
         }
 
         public string processControllerRegistryHost()
         {
-            return "127.0.0.1";
-        }
-
-        public bool registerProcessController()
-        {
-            return true;
+            return isEmulator() ? "127.0.0.1" : ""; // With an empty host, the controller will use IceDiscovery.
         }
     }
 }