From 84dbf462f8593d2df93012b23e027c7f1d4394c7 Mon Sep 17 00:00:00 2001
From: Winson Chung <winsonc@google.com>
Date: Tue, 18 Sep 2012 13:11:37 -0700
Subject: [PATCH] Fixing crash in emulator due to no BluetoothAdapter. (Bug
 7188166)

Change-Id: I63fe4b229a8a460170df153e71b7ad65655dfad1
---
 .../statusbar/policy/BluetoothController.java  | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/BluetoothController.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/BluetoothController.java
index 0567371995976..fece57ee06c0a 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/BluetoothController.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/BluetoothController.java
@@ -96,16 +96,18 @@ public class BluetoothController extends BroadcastReceiver {
     }
 
     private void updateBondedBluetoothDevices() {
-        Set<BluetoothDevice> devices = BluetoothAdapter.getDefaultAdapter().getBondedDevices();
-        if (devices != null) {
-            mBondedDevices.clear();
-            for (BluetoothDevice device : devices) {
-                if (device.getBondState() != BluetoothDevice.BOND_NONE) {
-                    mBondedDevices.add(device);
+        mBondedDevices.clear();
+
+        BluetoothAdapter adapter = BluetoothAdapter.getDefaultAdapter();
+        if (adapter != null) {
+            Set<BluetoothDevice> devices = adapter.getBondedDevices();
+            if (devices != null) {
+                for (BluetoothDevice device : devices) {
+                    if (device.getBondState() != BluetoothDevice.BOND_NONE) {
+                        mBondedDevices.add(device);
+                    }
                 }
             }
-        } else {
-            mBondedDevices.clear();
         }
     }