Fix multiple BT settings bugs.
- Change Bluetooth profiles screen to match ICS wireframes - Remove BluetoothProfilePreference.java (no longer used) - Remove "Pair with this device" summary below every unpaired device - Remove "Paired but not connected" summary below unconnected paired devices - Fix auto connection after pairing (reuse existing CachedBluetoothDevice) - Add "Connected (no phone/media)" summaries based on ICS wireframes - Fix visibility timeout strings. - Fix crash when starting Bluetooth from Settings shortcut widget. Bug: 5064139 Bug: 5064324 Bug: 5080404 Bug: 5093513 Bug: 5104485 Change-Id: Ie87103e183ce414c86cb1831a38ef0178b1b1292
This commit is contained in:
@@ -225,7 +225,7 @@ final class BluetoothEventManager {
|
||||
Log.w(TAG, "received ACTION_DISAPPEARED for an unknown device: " + device);
|
||||
return;
|
||||
}
|
||||
if (mDeviceManager.onDeviceDisappeared(cachedDevice)) {
|
||||
if (CachedBluetoothDeviceManager.onDeviceDisappeared(cachedDevice)) {
|
||||
synchronized (mCallbacks) {
|
||||
for (BluetoothCallback callback : mCallbacks) {
|
||||
callback.onDeviceDeleted(cachedDevice);
|
||||
@@ -283,7 +283,7 @@ final class BluetoothEventManager {
|
||||
|
||||
// if the device is undocked, remove it from the list as well
|
||||
if (!device.getAddress().equals(getDockedDeviceAddress(context))) {
|
||||
mDeviceManager.onDeviceDisappeared(cachedDevice);
|
||||
cachedDevice.setVisible(false);
|
||||
}
|
||||
}
|
||||
int reason = intent.getIntExtra(BluetoothDevice.EXTRA_REASON,
|
||||
@@ -361,7 +361,7 @@ final class BluetoothEventManager {
|
||||
if (device != null && device.getBondState() == BluetoothDevice.BOND_NONE) {
|
||||
CachedBluetoothDevice cachedDevice = mDeviceManager.findDevice(device);
|
||||
if (cachedDevice != null) {
|
||||
mDeviceManager.onDeviceDisappeared(cachedDevice);
|
||||
cachedDevice.setVisible(false);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user