Restarted from scratch; turns out we needed lots of this code for the browser testing still.

Author: InsertCreativityHere

java/test/android/controller/src/main/java/com/zeroc/testcontroller/ControllerApp.java

@@ -9,9 +9,6 @@
 import android.os.Build;
 import android.util.Log;
 
-import Test.Common.ProcessControllerPrx;
-import Test.Common.ProcessControllerRegistryPrx;
-
 import com.zeroc.Ice.Communicator;
 import com.zeroc.Ice.Logger;
 import com.zeroc.Ice.Time;
@@ -195,77 +192,8 @@ public ControllerI(boolean bluetooth) {
 
             _communicator = new com.zeroc.Ice.Communicator(initData);
             com.zeroc.Ice.ObjectAdapter adapter = _communicator.createObjectAdapter("ControllerAdapter");
-            ProcessControllerPrx processController =
-                    ProcessControllerPrx.uncheckedCast(
-                            adapter.add(
-                                    new ProcessControllerI(),
-                                    com.zeroc.Ice.Util.stringToIdentity("Android/ProcessController")));
+            adapter.add(new ProcessControllerI(), new com.zeroc.Ice.Identity("ProcessController", "Android"));
             adapter.activate();
-
-            if (!isEmulator())
-            {
-                // Use IceDiscovery to find a process controller registry
-                ProcessControllerRegistryPrx registry =
-                    ProcessControllerRegistryPrx.createProxy(_communicator, "Util/ProcessControllerRegistry");
-                registerProcessController(adapter, registry, processController);
-            }
-        }
-
-        public void registerProcessController(
-                final com.zeroc.Ice.ObjectAdapter adapter,
-                final ProcessControllerRegistryPrx registry,
-                final ProcessControllerPrx processController) {
-            registry.ice_pingAsync()
-                    .whenCompleteAsync(
-                            (r1, e1) -> {
-                                if (e1 != null) {
-                                    handleException(e1, adapter, registry, processController);
-                                } else {
-                                    com.zeroc.Ice.Connection connection = registry.ice_getConnection();
-                                    connection.setAdapter(adapter);
-                                    connection.setCloseCallback(
-                                            con -> {
-                                                println("connection with process controller registry closed");
-                                                while (true) {
-                                                    try {
-                                                        Thread.sleep(500);
-                                                        break;
-                                                    } catch (InterruptedException e) {
-                                                        // Ignore and try again.
-                                                    }
-                                                }
-                                                registerProcessController(adapter, registry, processController);
-                                            });
-
-                                    registry.setProcessControllerAsync(processController)
-                                            .whenCompleteAsync(
-                                                    (r2, e2) -> {
-                                                        if (e2 != null) {
-                                                            handleException(e2, adapter, registry, processController);
-                                                        }
-                                                    });
-                                }
-                            });
-        }
-
-        public void handleException(
-                Throwable ex,
-                final com.zeroc.Ice.ObjectAdapter adapter,
-                final ProcessControllerRegistryPrx registry,
-                final ProcessControllerPrx processController) {
-            if (ex instanceof com.zeroc.Ice.ConnectFailedException || ex instanceof com.zeroc.Ice.TimeoutException) {
-                while (true) {
-                    try {
-                        Thread.sleep(500);
-                        break;
-                    } catch (InterruptedException e) {
-                        // Ignore and try again.
-                    }
-                }
-                registerProcessController(adapter, registry, processController);
-            } else {
-                println(ex.toString());
-            }
         }
 
         public void destroy() {

scripts/Util.py

@@ -2378,7 +2378,6 @@ def getController(self, current):
 
         if controllerEndpoints is not None:
             proxy = Test.Common.ProcessControllerPrx(comm, f"{comm.identityToString(ident)}:{controllerEndpoints}")
-
         else:
             # Use well-known proxy and IceDiscovery to discover the process controller object from the app.
             proxy = Test.Common.ProcessControllerPrx(comm, comm.identityToString(ident))
@@ -2402,10 +2401,8 @@ def callback(future):
         while nRetry < 120:
             nRetry += 1
 
-            # If the process controller supports discovery or if we have a direct endpoint to it, try to
-            # ping it. This can take a few tries as the controller app might still be starting.
-            if self.supportsDiscovery() or controllerEndpoints is not None:
-                proxy.ice_pingAsync().add_done_callback(callback)
+            # try to ping the controller. This can take a few tries as the controller app might still be starting.
+            proxy.ice_pingAsync().add_done_callback(callback)
 
             with self.cond:
                 if ident not in self.processControllerProxies:
@@ -2498,13 +2495,8 @@ def destroy(self, driver):
 
 class AndroidProcessController(RemoteProcessController):
     def __init__(self, current):
-        endpoint = None
-        self.forwardPort = None
-        if current.config.device:
-            endpoint = "tcp -h 0.0.0.0 -p 15001"
-        elif current.config.avd or not current.config.device:
-            self.forwardPort = "15001"
-        RemoteProcessController.__init__(self, current, endpoint)
+        RemoteProcessController.__init__(self, current, "")
+        self.forwardPort = "15001" if not current.config.device and current.config.avd else None
         self.device = current.config.device if current.config.device != "" else None
         self.avd = current.config.avd
         self.emulator = None  # Keep a reference to the android emulator process
@@ -2544,7 +2536,7 @@ def startEmulator(self, avd):
             raise RuntimeError("couldn't find AVD `{}'".format(avd))
 
         #
-        # Find and unused port to run android emulator, between 5554 and 5584
+        # Find an unused port to run android emulator, between 5554 and 5584
         #
         port = -1
         out = run("adb devices -l")