[Swingme-svn] SF.net SVN: swingme:[846] AndroidME

[<jan...@us...>]

Revision: 846
          http://swingme.svn.sourceforge.net/swingme/?rev=846&view=rev
Author:   janeroski
Date:     2010-04-28 08:48:54 +0000 (Wed, 28 Apr 2010)

Log Message:
-----------
Bluetooth: Uncaught exception on emulator (2.0/2.1)
- If hardware is not supported don't let APPs get and instance of LocalDevice

Modified Paths:
--------------
    AndroidME/AndroidTODO.txt
    AndroidME/src_JSR82_Bluetooth/javax/bluetooth/LocalDevice.java

Modified: AndroidME/AndroidTODO.txt
===================================================================
--- AndroidME/AndroidTODO.txt	2010-04-27 21:09:05 UTC (rev 845)
+++ AndroidME/AndroidTODO.txt	2010-04-28 08:48:54 UTC (rev 846)
@@ -1,9 +1,8 @@
-- setCurrentDisplay to null, should set app to background
 - SMS
 - Photo browser being able to go to next and previous image
 
-
 --- DONE ---
+- setCurrentDisplay to null, should set app to background
 - Blue tooth
 - Camera
 - PIM 2 versions (on Android 2.* uses the deprecated API from 1.6, but can read/write contacts)

Modified: AndroidME/src_JSR82_Bluetooth/javax/bluetooth/LocalDevice.java
===================================================================
--- AndroidME/src_JSR82_Bluetooth/javax/bluetooth/LocalDevice.java	2010-04-27 21:09:05 UTC (rev 845)
+++ AndroidME/src_JSR82_Bluetooth/javax/bluetooth/LocalDevice.java	2010-04-28 08:48:54 UTC (rev 846)
@@ -12,6 +12,8 @@
 import android.bluetooth.BluetoothAdapter;
 import javax.microedition.io.Connection;
 
+import net.yura.android.bluetooth.BluetoothManager;
+
 /**
  * The <code>LocalDevice</code> class defines the basic functions of the
  * Bluetooth manager.  The
@@ -55,8 +57,9 @@
 
 	    try {
 
-	        // Make sure we have a valid BluetoothAdapter...
+	        // Make sure we have a valid BluetoothAdapter and BluetoothManager...
 	        BluetoothAdapter.getDefaultAdapter();
+	        BluetoothManager.getBluetoothManager();
 
     	    if (deviceInstance == null) {
     	        deviceInstance = new LocalDevice();


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.