diff options
Diffstat (limited to 'java/test/android/controller')
| -rw-r--r-- | java/test/android/controller/src/main/java/com/zeroc/testcontroller/ControllerApp.java | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/java/test/android/controller/src/main/java/com/zeroc/testcontroller/ControllerApp.java b/java/test/android/controller/src/main/java/com/zeroc/testcontroller/ControllerApp.java index d3582c03d7b..68784a68fae 100644 --- a/java/test/android/controller/src/main/java/com/zeroc/testcontroller/ControllerApp.java +++ b/java/test/android/controller/src/main/java/com/zeroc/testcontroller/ControllerApp.java @@ -214,12 +214,19 @@ public class ControllerApp extends Application adapter.add(new ProcessControllerI(), com.zeroc.Ice.Util.stringToIdentity("Android/ProcessController"))); adapter.activate(); + ProcessControllerRegistryPrx registry; if(isEmulator()) { - ProcessControllerRegistryPrx registry = ProcessControllerRegistryPrx.uncheckedCast( + registry = ProcessControllerRegistryPrx.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 = ProcessControllerRegistryPrx.uncheckedCast( + _communicator.stringToProxy("Util/ProcessControllerRegistry")); + } + registerProcessController(adapter, registry, processController); println("Android/ProcessController"); } |