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

am 239c7667: am 7d8ccb41: Merge "Fix crash in BluetoothControllerImpl" into lmp-mr1-dev automerge: 70cf2f7

Browse Source 
* commit '239c7667dd71754029b27fdec7b63f7f8e15c86b':
  Fix crash in BluetoothControllerImpl
This commit is contained in:
Jason Monk
2014-12-12 04:12:21 +00:00
committed by Android Git Automerger
parent 368cf66e20 239c7667dd
commit fe97467bfc
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -289,9 +289,11 @@ public class BluetoothControllerImpl implements BluetoothController {
.getDevicesMatchingConnectionStates(connectionType);
for (int k = 0; k < devices.size(); k++) {
DeviceInfo info = mDeviceInfo.get(devices.get(k));
info.connectionState = CONNECTION_STATES[i];
if (CONNECTION_STATES[i] == BluetoothProfile.STATE_CONNECTED) {
info.connectedProfiles.put(profile, true);
if (info != null) {
info.connectionState = CONNECTION_STATES[i];
if (CONNECTION_STATES[i] == BluetoothProfile.STATE_CONNECTED) {
info.connectedProfiles.put(profile, true);
}
}
}
}