Merge "Fixing crash in emulator due to no BluetoothAdapter. (Bug 7188166)" into jb-mr1-dev (688ca470) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/statusbar/policy/BluetoothController.java

+10 −8

Original line number	Diff line number	Diff line
		@@ -96,16 +96,18 @@ public class BluetoothController extends BroadcastReceiver {
		}

		private void updateBondedBluetoothDevices() {
		Set<BluetoothDevice> devices = BluetoothAdapter.getDefaultAdapter().getBondedDevices();
		if (devices != null) {
		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();
		}
		}
		}