Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bf4a17aa authored by Winson Chung's avatar Winson Chung Committed by Android Git Automerger
Browse files

am 688ca470: Merge "Fixing crash in emulator due to no BluetoothAdapter. (Bug... 

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

* commit '688ca470':
  Fixing crash in emulator due to no BluetoothAdapter. (Bug 7188166)
parents 65e1922a 688ca470

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

            }

        }

    }