24Q3: Remove Flag enable_hide_exclusively_managed_bluetooth_device

Bug: 324475542
Test: atest: com.android.settings.bluetooth.ConnectedBluetoothDeviceUpdaterTest
Test: atest: com.android.settings.bluetooth.SavedBluetoothDeviceUpdaterTest
Flag: EXEMPT removing com.android.settingslib.flags.enable_hide_exclusively_managed_bluetooth_device
Change-Id: Ibcf78a0a72409371557f07f4c42c676d07c0741b
This commit is contained in:
Srinivas Patibandla
2025-02-28 21:54:42 +00:00
parent c5777c85f6
commit 6607546f1e
5 changed files with 14 additions and 76 deletions

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