IOIO: android integration

Author: chrisws

ioio/ioio/src/main/AndroidManifest.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="net.sourceforge.smallbasic.ioio" >
+	<uses-feature android:name="android.hardware.usb.accessory" android:required="false" />
+</manifest>

ioio/ioio/src/main/java/ioio/lib/android/AccessoryConnectionBootstrap.java

@@ -37,7 +37,6 @@
 import android.content.IntentFilter;
 import android.os.Build;
 import android.os.ParcelFileDescriptor;
-import android.util.Log;
 
 import net.sourceforge.smallbasic.ioio.IOIOLoader;
 
@@ -56,6 +55,7 @@
 import ioio.lib.impl.FixedReadBufferedInputStream;
 import ioio.lib.spi.IOIOConnectionBootstrap;
 import ioio.lib.spi.IOIOConnectionFactory;
+import ioio.lib.spi.Log;
 import ioio.lib.spi.NoRuntimeSupportException;
 
 public class AccessoryConnectionBootstrap extends BroadcastReceiver implements IOIOConnectionBootstrap, IOIOConnectionFactory {
@@ -191,8 +191,7 @@ private boolean tryOpen() {
     if (!usbManager.hasPermission(accessory)) {
       if (pendingIntent == null) {
         Log.v(TAG, "Requesting permission.");
-        pendingIntent = PendingIntent.getBroadcast(activity, 0, new Intent(
-                                                                             ACTION_USB_PERMISSION), 0);
+        pendingIntent = PendingIntent.getBroadcast(activity, 0, new Intent(ACTION_USB_PERMISSION), 0);
         usbManager.requestPermission(accessory, pendingIntent);
       }
       return false;
@@ -228,7 +227,7 @@ private boolean tryOpen() {
         // bug:
         // http://code.google.com/p/android/issues/detail?id=20545
         while (inputStream.read() != 1) {
-          trySleep(1000);
+          trySleep();
         }
 
         success = true;
@@ -262,10 +261,10 @@ private void registerReceiver() {
     }
   }
 
-  private void trySleep(long time) {
+  private void trySleep() {
     synchronized (AccessoryConnectionBootstrap.this) {
       try {
-        AccessoryConnectionBootstrap.this.wait(time);
+        AccessoryConnectionBootstrap.this.wait(1000);
       } catch (InterruptedException e) {
         Log.e(TAG, e.toString());
       }

ioio/main.cpp

@@ -134,18 +134,13 @@ struct IOTask {
     auto exc = g_env->ExceptionOccurred();
     if (exc) {
       if (retval) {
-#if defined(ANDROID_MODULE)
-        // avoid: JNI DETECTED ERROR IN APPLICATION: JNI FindClass called with pending exception
-        error(retval, "Java exception - see adb logcat");
         g_env->ExceptionClear();
-#else
         jclass clazz = g_env->FindClass("java/lang/Object");
         jmethodID methodId = g_env->GetMethodID(clazz, "toString", "()Ljava/lang/String;");
         jstring jstr = (jstring) g_env->CallObjectMethod(exc, methodId);
         const char *message = g_env->GetStringUTFChars(jstr, JNI_FALSE);
         error(retval, message);
         g_env->ReleaseStringUTFChars(jstr, message);
-#endif
       } else {
         g_env->ExceptionDescribe();
         g_env->ExceptionClear();