commit bd6afd6fae1f81d25fb5351d6fa16b99e16acb8a
author Jaikumar Ganesh <jaikumar@google.com> Mon Aug 09 15:55:35 2010 -0700
committer Jaikumar Ganesh <jaikumar@google.com> Mon Aug 09 15:59:33 2010 -0700
tree 0ee45603d95c08dabbea368209bbbe738fa6ec86
parent 9498d7f519b59becbfa6f36f436cdbba07dfa09f

Check for null on BondedDevices call.

Change-Id: I2e5f9259ce210b2bb9854715b5a4d04a1faea185

src/com/android/phone/BluetoothHeadsetService.java

diff --git a/src/com/android/phone/BluetoothHeadsetService.java b/src/com/android/phone/BluetoothHeadsetService.java
index b1f68ee..70e14a0 100644
--- a/src/com/android/phone/BluetoothHeadsetService.java
+++ b/src/com/android/phone/BluetoothHeadsetService.java
@@ -537,19 +537,21 @@
         // Only 1 device is set to AUTO_CONNECT
         BluetoothDevice savedDevice = null;
         int max_priority = BluetoothHeadset.PRIORITY_AUTO_CONNECT;
-        for (BluetoothDevice device : mAdapter.getBondedDevices()) {
-            int priority = getPriority(device);
-            if (priority >= BluetoothHeadset.PRIORITY_AUTO_CONNECT) {
-                setPriority(device, BluetoothHeadset.PRIORITY_ON);
+        if (mAdapter.getBondedDevices() != null) {
+            for (BluetoothDevice device : mAdapter.getBondedDevices()) {
+                int priority = getPriority(device);
+                if (priority >= BluetoothHeadset.PRIORITY_AUTO_CONNECT) {
+                    setPriority(device, BluetoothHeadset.PRIORITY_ON);
+                }
+                if (priority >= max_priority) {
+                    max_priority = priority;
+                    savedDevice = device;
+                }
             }
-            if (priority >= max_priority) {
-                max_priority = priority;
-                savedDevice = device;
+            if (savedDevice != null) {
+                setPriority(savedDevice, BluetoothHeadset.PRIORITY_AUTO_CONNECT);
             }
         }
-        if (savedDevice != null) {
-            setPriority(savedDevice, BluetoothHeadset.PRIORITY_AUTO_CONNECT);
-        }
     }
 
     private synchronized void getSdpRecordsAndConnect(BluetoothDevice device) {