Merge "Fix crash in BluetoothControllerImpl" into lmp-mr1-dev (7d8ccb41) · Commits · e / os / android_frameworks_base

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;
		}