diff --git a/aconfig/settings_connecteddevice_flag_declarations.aconfig b/aconfig/settings_connecteddevice_flag_declarations.aconfig index b008c2082e8..b78acdcd9ac 100644 --- a/aconfig/settings_connecteddevice_flag_declarations.aconfig +++ b/aconfig/settings_connecteddevice_flag_declarations.aconfig @@ -29,16 +29,6 @@ flag { bug: "317367746" } -flag { - name: "enable_bonded_bluetooth_device_searchable" - namespace: "pixel_cross_device_control" - description: "Set bonded bluetooth devices under connected devices page to be searchable by Settings search." - bug: "319056077" - metadata { - purpose: PURPOSE_BUGFIX - } -} - flag { name: "exclude_webcam_auth_challenge" namespace: "safety_center" diff --git a/src/com/android/settings/connecteddevice/ConnectedDeviceGroupController.java b/src/com/android/settings/connecteddevice/ConnectedDeviceGroupController.java index 2548b95aac4..c4553123171 100644 --- a/src/com/android/settings/connecteddevice/ConnectedDeviceGroupController.java +++ b/src/com/android/settings/connecteddevice/ConnectedDeviceGroupController.java @@ -44,7 +44,6 @@ import com.android.settings.core.PreferenceControllerMixin; import com.android.settings.dashboard.DashboardFragment; import com.android.settings.flags.FeatureFlags; import com.android.settings.flags.FeatureFlagsImpl; -import com.android.settings.flags.Flags; import com.android.settings.overlay.DockUpdaterFeatureProvider; import com.android.settings.overlay.FeatureFactory; import com.android.settingslib.bluetooth.BluetoothDeviceFilter; @@ -280,9 +279,6 @@ public class ConnectedDeviceGroupController extends BasePreferenceController @Override public void updateDynamicRawDataToIndex(List rawData) { - if (!Flags.enableBondedBluetoothDeviceSearchable()) { - return; - } if (mLocalBluetoothManager == null) { Log.d(TAG, "Bluetooth is not supported"); return; diff --git a/tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceGroupControllerTest.java b/tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceGroupControllerTest.java index 6fb2d114f46..d754993d998 100644 --- a/tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceGroupControllerTest.java +++ b/tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceGroupControllerTest.java @@ -344,7 +344,6 @@ public class ConnectedDeviceGroupControllerTest { } @Test - @EnableFlags(Flags.FLAG_ENABLE_BONDED_BLUETOOTH_DEVICE_SEARCHABLE) public void updateDynamicRawDataToIndex_deviceNotBonded_deviceIsNotSearchable() { when(mDevice.getBondState()).thenReturn(BluetoothDevice.BOND_NONE); List searchData = new ArrayList<>(); @@ -355,7 +354,6 @@ public class ConnectedDeviceGroupControllerTest { } @Test - @EnableFlags(Flags.FLAG_ENABLE_BONDED_BLUETOOTH_DEVICE_SEARCHABLE) public void updateDynamicRawDataToIndex_deviceBonded_deviceIsSearchable() { when(mDevice.getBondState()).thenReturn(BluetoothDevice.BOND_BONDED); List searchData = new ArrayList<>();