Merge "Fix settings NPE crash on launch." into honeycomb

2011-01-27 14:05:44 -08:00
parent c5708925c6 632a10f470
commit 6d509d2f35
1 changed files with 6 additions and 1 deletions
--- a/src/com/android/settings/bluetooth/LocalBluetoothProfileManager.java
+++ b/src/com/android/settings/bluetooth/LocalBluetoothProfileManager.java
@@ -30,6 +30,7 @@ import android.os.Handler;
 import android.os.ParcelUuid;
 import android.util.Log;

+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.LinkedList;
@@ -466,7 +467,11 @@ abstract class LocalBluetoothProfileManager {

        @Override
        public List<BluetoothDevice> getConnectedDevices() {
-            return mService.getConnectedDevices();
+            if (mService != null) {
+                return mService.getConnectedDevices();
+            } else {
+                return new ArrayList<BluetoothDevice>();
+            }
        }

        @Override