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

Commit 239c7667 authored by Jason Monk's avatar Jason Monk Committed by android-build-merger
Browse files

am 7d8ccb41: Merge "Fix crash in BluetoothControllerImpl" into lmp-mr1-dev 

automerge: 70cf2f72

* commit '70cf2f72':
  Fix crash in BluetoothControllerImpl
parents dee84a87 70cf2f72

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

+5 −3
Original line number Diff line number Diff line
@@ -289,6 +289,7 @@ public class BluetoothControllerImpl implements BluetoothController { 
                        .getDevicesMatchingConnectionStates(connectionType);

                for (int k = 0; k < devices.size(); k++) {

                    DeviceInfo info = mDeviceInfo.get(devices.get(k));

                    if (info != null) {

                        info.connectionState = CONNECTION_STATES[i];

                        if (CONNECTION_STATES[i] == BluetoothProfile.STATE_CONNECTED) {

                            info.connectedProfiles.put(profile, true);
@@ -296,6 +297,7 @@ public class BluetoothControllerImpl implements BluetoothController { 
                    }

                }

            }

        }

        if (mLastDevice == null && bondedCount == 1) {

            mLastDevice = lastBonded;

        }