PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "The UI only shows the active LE device" into tm-d1-dev

Browse Source
This commit is contained in:
SongFerng Wang
2022-06-26 16:38:24 +00:00
committed by Android (Google) Code Review
parent 3c670f625b 6426382e90
commit dc72a4a14f
7 changed files with 114 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/bluetooth/AvailableMediaBluetoothDeviceUpdater.java
View File

@@ -66,7 +66,7 @@ public class AvailableMediaBluetoothDeviceUpdater extends BluetoothDeviceUpdater
}
boolean isFilterMatched = false;
if (isDeviceConnected(cachedDevice)) {
if (isDeviceConnected(cachedDevice) && isDeviceInCachedDevicesList(cachedDevice)) {
if (DBG) {
Log.d(TAG, "isFilterMatched() current audio profile : " + currentAudioProfile);
}
@@ -74,6 +74,8 @@ public class AvailableMediaBluetoothDeviceUpdater extends BluetoothDeviceUpdater
// It would show in Available Devices group.
if (cachedDevice.isConnectedHearingAidDevice()
|| cachedDevice.isConnectedLeAudioDevice()) {
Log.d(TAG, "isFilterMatched() device : " +
cachedDevice.getName() + ", the profile is connected.");
return true;
}
// According to the current audio profile type,

4
src/com/android/settings/bluetooth/BluetoothDeviceUpdater.java
View File

@@ -326,4 +326,8 @@ public abstract class BluetoothDeviceUpdater implements BluetoothCallback,
((BluetoothDevicePreference) preference).onPreferenceAttributesChanged();
}
}
protected boolean isDeviceInCachedDevicesList(CachedBluetoothDevice cachedDevice){
return mLocalManager.getCachedDeviceManager().getCachedDevicesCopy().contains(cachedDevice);
}
}

2
src/com/android/settings/bluetooth/ConnectedBluetoothDeviceUpdater.java
View File

@@ -66,7 +66,7 @@ public class ConnectedBluetoothDeviceUpdater extends BluetoothDeviceUpdater {
}
boolean isFilterMatched = false;
if (isDeviceConnected(cachedDevice)) {
if (isDeviceConnected(cachedDevice) && isDeviceInCachedDevicesList(cachedDevice)) {
if (DBG) {
Log.d(TAG, "isFilterMatched() current audio profile : " + currentAudioProfile);
}

3
src/com/android/settings/bluetooth/SavedBluetoothDeviceUpdater.java
View File

@@ -106,7 +106,8 @@ public class SavedBluetoothDeviceUpdater extends BluetoothDeviceUpdater
+ cachedDevice.isConnected());
}
return device.getBondState() == BluetoothDevice.BOND_BONDED
&& (mDisplayConnected || !device.isConnected());
&& (mDisplayConnected || (!device.isConnected() && isDeviceInCachedDevicesList(
cachedDevice)));
}
@Override