diff options
author | Benoit Foucher <benoit@zeroc.com> | 2018-11-21 17:47:35 +0100 |
---|---|---|
committer | Benoit Foucher <benoit@zeroc.com> | 2018-11-21 17:49:06 +0100 |
commit | a11945b449ae38efd6f79541c573c0028687c234 (patch) | |
tree | b68a6c1b3a97b6e95009b5ec7810e891bb209a65 /csharp/test/xamarin/controller.Android | |
parent | Fixed Android Bluetooth acceptor race condition, fixes #181 (diff) | |
download | ice-a11945b449ae38efd6f79541c573c0028687c234.tar.bz2 ice-a11945b449ae38efd6f79541c573c0028687c234.tar.xz ice-a11945b449ae38efd6f79541c573c0028687c234.zip |
Android and Xamarin test controller fixes and improvements
Diffstat (limited to 'csharp/test/xamarin/controller.Android')
-rw-r--r-- | csharp/test/xamarin/controller.Android/MainActivity.cs | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/csharp/test/xamarin/controller.Android/MainActivity.cs b/csharp/test/xamarin/controller.Android/MainActivity.cs index 5540cbd2e99..e9bfa3dbf17 100644 --- a/csharp/test/xamarin/controller.Android/MainActivity.cs +++ b/csharp/test/xamarin/controller.Android/MainActivity.cs @@ -77,11 +77,6 @@ namespace controller.Droid LoadApplication(new App(this)); } - public bool registerProcessController() - { - return true; - } - public bool isEmulator() { return Build.Fingerprint.Contains("vbox") || @@ -102,7 +97,7 @@ namespace controller.Droid public string processControllerRegistryHost() { - return isEmulator() ? "10.0.2.2" : "127.0.0.1"; + return isEmulator() ? "10.0.2.2" : ""; // With an empty host, the controller will use IceDiscovery. } } } |