Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fixing crash in emulator due to no BluetoothAdapter. (Bug 7188166)" into jb-mr1-dev

Browse Source
This commit is contained in:
Winson Chung
2012-09-18 15:34:37 -07:00
committed by Android (Google) Code Review
parent 6eac514a02 84dbf462f8
commit 688ca4708b
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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();
}
}