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

Merge "Fix crash in BluetoothControllerImpl" into lmp-mr1-dev

Browse Source
This commit is contained in:
Jason Monk
2014-12-11 19:22:17 +00:00
committed by Android (Google) Code Review
parent c5da1d3ddf 1206321f38
commit 7d8ccb41fa
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); .getDevicesMatchingConnectionStates(connectionType);
for (int k = 0; k < devices.size(); k++) { for (int k = 0; k < devices.size(); k++) {
DeviceInfo info = mDeviceInfo.get(devices.get(k)); DeviceInfo info = mDeviceInfo.get(devices.get(k));
info.connectionState = CONNECTION_STATES[i]; if (info != null) {
if (CONNECTION_STATES[i] == BluetoothProfile.STATE_CONNECTED) { info.connectionState = CONNECTION_STATES[i];
info.connectedProfiles.put(profile, true); if (CONNECTION_STATES[i] == BluetoothProfile.STATE_CONNECTED) {
info.connectedProfiles.put(profile, true);
}
} }
} }
} }