Android and Xamarin test controller fixes and improvements

1 files changed, 9 insertions, 2 deletions

diff --git a/java-compat/test/android/controller/src/main/java/com/zeroc/testcontroller/ControllerApp.java b/java-compat/test/android/controller/src/main/java/com/zeroc/testcontroller/ControllerApp.java
index 78c207a517c..1fc659b01ca 100644
--- a/java-compat/test/android/controller/src/main/java/com/zeroc/testcontroller/ControllerApp.java
+++ b/java-compat/test/android/controller/src/main/java/com/zeroc/testcontroller/ControllerApp.java
@@ -216,12 +216,19 @@ public class ControllerApp extends Application
             ProcessControllerPrx processController = ProcessControllerPrxHelper.uncheckedCast(
                     adapter.add(new ProcessControllerI(), Ice.Util.stringToIdentity("AndroidCompat/ProcessController")));
             adapter.activate();
+            ProcessControllerRegistryPrx registry;
             if(isEmulator())
             {
-                ProcessControllerRegistryPrx registry = ProcessControllerRegistryPrxHelper.uncheckedCast(
+                registry = ProcessControllerRegistryPrxHelper.uncheckedCast(
                         _communicator.stringToProxy("Util/ProcessControllerRegistry:tcp -h 10.0.2.2 -p 15001"));
-                registerProcessController(adapter, registry, processController);
             }
+            else
+            {
+                // Use IceDiscovery to find a process controller registry
+                registry = ProcessControllerRegistryPrxHelper.uncheckedCast(
+                        _communicator.stringToProxy("Util/ProcessControllerRegistry"));
+            }
+            registerProcessController(adapter, registry, processController);
             println("AndroidCompat/ProcessController");
         }