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

Merge "24Q3: Remove Flag enable_hide_exclusively_managed_bluetooth_device" into main

Browse Source
This commit is contained in:
Srinivas Patibandla
2025-03-04 10:08:39 -08:00
committed by Android (Google) Code Review
parent 00dc2384f4 6607546f1e
commit aba8de169b
5 changed files with 14 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -26,7 +26,6 @@ import androidx.preference.Preference;
import com.android.settings.connecteddevice.DevicePreferenceCallback;
import com.android.settingslib.bluetooth.BluetoothUtils;
import com.android.settingslib.bluetooth.CachedBluetoothDevice;
import com.android.settingslib.flags.Flags;
/**
* Controller to maintain connected bluetooth devices
@@ -105,14 +104,12 @@ public class ConnectedBluetoothDeviceUpdater extends BluetoothDeviceUpdater {
cachedDevice.getName() + ", isFilterMatched : " + isFilterMatched);
}
}
if (Flags.enableHideExclusivelyManagedBluetoothDevice()) {
if (BluetoothUtils.isExclusivelyManagedBluetoothDevice(mContext,
cachedDevice.getDevice())) {
if (DBG) {
Log.d(TAG, "isFilterMatched() hide BluetoothDevice with exclusive manager");
}
return false;
if (BluetoothUtils.isExclusivelyManagedBluetoothDevice(mContext,
cachedDevice.getDevice())) {
if (DBG) {
Log.d(TAG, "isFilterMatched() hide BluetoothDevice with exclusive manager");
}
return false;
}
return isFilterMatched;
}

13
src/com/android/settings/bluetooth/DeviceListPreferenceFragment.kt
View File

@@ -40,7 +40,6 @@ import com.android.settingslib.bluetooth.BluetoothUtils
import com.android.settingslib.bluetooth.CachedBluetoothDevice
import com.android.settingslib.bluetooth.CachedBluetoothDeviceManager
import com.android.settingslib.bluetooth.LocalBluetoothManager
import com.android.settingslib.flags.Flags
import java.util.concurrent.ConcurrentHashMap
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Dispatchers
@@ -219,13 +218,11 @@ abstract class DeviceListPreferenceFragment(restrictedKey: String?) :
)
return
}
if (Flags.enableHideExclusivelyManagedBluetoothDevice()) {
if (cachedDevice.device.bondState == BluetoothDevice.BOND_BONDED
&& BluetoothUtils.isExclusivelyManagedBluetoothDevice(
prefContext, cachedDevice.device)) {
Log.d(TAG, "Trying to create preference for a exclusively managed device")
return
}
if (cachedDevice.device.bondState == BluetoothDevice.BOND_BONDED
&& BluetoothUtils.isExclusivelyManagedBluetoothDevice(
prefContext, cachedDevice.device)) {
Log.d(TAG, "Trying to create preference for a exclusively managed device")
return
}
// Only add device preference when it's not found in the map and there's no other state
// message showing in the list

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

@@ -28,7 +28,6 @@ import com.android.settings.connecteddevice.DevicePreferenceCallback;
import com.android.settingslib.bluetooth.BluetoothUtils;
import com.android.settingslib.bluetooth.CachedBluetoothDevice;
import com.android.settingslib.bluetooth.CachedBluetoothDeviceManager;
import com.android.settingslib.flags.Flags;
import java.util.ArrayList;
import java.util.List;
@@ -107,16 +106,10 @@ public class SavedBluetoothDeviceUpdater extends BluetoothDeviceUpdater
+ ", is connected : " + device.isConnected() + ", is profile connected : "
+ cachedDevice.isConnected() + ", is exclusively managed : "
+ isExclusivelyManaged);
if (Flags.enableHideExclusivelyManagedBluetoothDevice()) {
return device.getBondState() == BluetoothDevice.BOND_BONDED
&& (mShowConnectedDevice || (!device.isConnected()
&& isDeviceInCachedDevicesList(cachedDevice)))
&& !isExclusivelyManaged;
} else {
return device.getBondState() == BluetoothDevice.BOND_BONDED
&& (mShowConnectedDevice || (!device.isConnected()
&& isDeviceInCachedDevicesList(cachedDevice)));
}
return device.getBondState() == BluetoothDevice.BOND_BONDED
&& (mShowConnectedDevice || (!device.isConnected()
&& isDeviceInCachedDevicesList(cachedDevice)))
&& !isExclusivelyManaged;
}
@Override