diff options
| author | Mark Spruiell <mes@zeroc.com> | 2017-06-13 14:10:16 -0700 |
|---|---|---|
| committer | Mark Spruiell <mes@zeroc.com> | 2017-06-13 14:10:16 -0700 |
| commit | 207d518ba33c1d802ad3f3dbdb9a5fa80ad9037a (patch) | |
| tree | b26e87495ed748d46269e0d9563e575401729057 /java/android/controller/src | |
| parent | js/Ice/exception fixes to print exception that causes the failure (diff) | |
| download | ice-207d518ba33c1d802ad3f3dbdb9a5fa80ad9037a.tar.bz2 ice-207d518ba33c1d802ad3f3dbdb9a5fa80ad9037a.tar.xz ice-207d518ba33c1d802ad3f3dbdb9a5fa80ad9037a.zip | |
Java & Android test fixes
Diffstat (limited to 'java/android/controller/src')
| -rw-r--r-- | java/android/controller/src/main/AndroidManifest.xml | 2 | ||||
| -rw-r--r-- | java/android/controller/src/main/java/com/zeroc/testcontroller/ControllerApp.java | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/java/android/controller/src/main/AndroidManifest.xml b/java/android/controller/src/main/AndroidManifest.xml index e1e041d8acd..20a819e4cad 100644 --- a/java/android/controller/src/main/AndroidManifest.xml +++ b/java/android/controller/src/main/AndroidManifest.xml @@ -6,6 +6,8 @@ <uses-permission android:name="android.permission.INTERNET" /> <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" /> <uses-permission android:name="android.permission.CHANGE_WIFI_MULTICAST_STATE" /> + <uses-permission android:name="android.permission.BLUETOOTH" /> + <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" /> <!-- http://developer.android.com/guide/topics/manifest/uses-sdk-element.html diff --git a/java/android/controller/src/main/java/com/zeroc/testcontroller/ControllerApp.java b/java/android/controller/src/main/java/com/zeroc/testcontroller/ControllerApp.java index 3c43d86416b..d55207bc448 100644 --- a/java/android/controller/src/main/java/com/zeroc/testcontroller/ControllerApp.java +++ b/java/android/controller/src/main/java/com/zeroc/testcontroller/ControllerApp.java @@ -206,7 +206,8 @@ public class ControllerApp extends Application initData.properties.setProperty("Ice.Override.ConnectTimeout", "1000"); if(!isEmulator()) { - initData.properties.setProperty("Ice.Plugin.IceDiscovery", "IceDiscovery.PluginFactory"); + initData.properties.setProperty("Ice.Plugin.IceBT", "com.zeroc.IceBT.PluginFactory"); + initData.properties.setProperty("Ice.Plugin.IceDiscovery", "com.zeroc.IceDiscovery.PluginFactory"); initData.properties.setProperty("IceDiscovery.DomainId", "TestController"); } _communicator = com.zeroc.Ice.Util.initialize(initData); @@ -469,7 +470,6 @@ public class ControllerApp extends Application { println("starting " + testsuite + " " + exe + "... "); String className = "test." + testsuite.replace("/", ".") + "." + exe.substring(0, 1).toUpperCase() + exe.substring(1); - String dexFile = "test_" + testsuite.replace("/", "_") + ".dex"; try { TestSuiteBundle bundle = new TestSuiteBundle(className, getClassLoader()); |