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

[Cleanup] remove flag enable_bonded_bluetooth_device_searchable

Browse Source 
the feature is enabled in prod already

Test: atest ConnectedDeviceGroupControllerTest
Bug: N/A
Change-Id: I7b2674bd42ed0a3bbe03c74ff52c3ccd830178dc
Flag: EXEMPT just cleanup
This commit is contained in:
yqian
2025-01-20 16:56:47 +08:00
committed by Yuanru Qian
parent 1436ea1351
commit 4dfe488d8b
3 changed files with 0 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
aconfig/settings_connecteddevice_flag_declarations.aconfig
View File

@@ -29,16 +29,6 @@ flag {
bug: "317367746" 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 { flag {
name: "exclude_webcam_auth_challenge" name: "exclude_webcam_auth_challenge"
namespace: "safety_center" namespace: "safety_center"

4
src/com/android/settings/connecteddevice/ConnectedDeviceGroupController.java
View File

@@ -44,7 +44,6 @@ import com.android.settings.core.PreferenceControllerMixin;
import com.android.settings.dashboard.DashboardFragment; import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.flags.FeatureFlags; import com.android.settings.flags.FeatureFlags;
import com.android.settings.flags.FeatureFlagsImpl; import com.android.settings.flags.FeatureFlagsImpl;
import com.android.settings.flags.Flags;
import com.android.settings.overlay.DockUpdaterFeatureProvider; import com.android.settings.overlay.DockUpdaterFeatureProvider;
import com.android.settings.overlay.FeatureFactory; import com.android.settings.overlay.FeatureFactory;
import com.android.settingslib.bluetooth.BluetoothDeviceFilter; import com.android.settingslib.bluetooth.BluetoothDeviceFilter;
@@ -280,9 +279,6 @@ public class ConnectedDeviceGroupController extends BasePreferenceController
@Override @Override
public void updateDynamicRawDataToIndex(List<SearchIndexableRaw> rawData) { public void updateDynamicRawDataToIndex(List<SearchIndexableRaw> rawData) {
if (!Flags.enableBondedBluetoothDeviceSearchable()) {
return;
}
if (mLocalBluetoothManager == null) { if (mLocalBluetoothManager == null) {
Log.d(TAG, "Bluetooth is not supported"); Log.d(TAG, "Bluetooth is not supported");
return; return;

2
tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceGroupControllerTest.java
View File

@@ -344,7 +344,6 @@ public class ConnectedDeviceGroupControllerTest {
} }
@Test @Test
@EnableFlags(Flags.FLAG_ENABLE_BONDED_BLUETOOTH_DEVICE_SEARCHABLE)
public void updateDynamicRawDataToIndex_deviceNotBonded_deviceIsNotSearchable() { public void updateDynamicRawDataToIndex_deviceNotBonded_deviceIsNotSearchable() {
when(mDevice.getBondState()).thenReturn(BluetoothDevice.BOND_NONE); when(mDevice.getBondState()).thenReturn(BluetoothDevice.BOND_NONE);
List<SearchIndexableRaw> searchData = new ArrayList<>(); List<SearchIndexableRaw> searchData = new ArrayList<>();
@@ -355,7 +354,6 @@ public class ConnectedDeviceGroupControllerTest {
} }
@Test @Test
@EnableFlags(Flags.FLAG_ENABLE_BONDED_BLUETOOTH_DEVICE_SEARCHABLE)
public void updateDynamicRawDataToIndex_deviceBonded_deviceIsSearchable() { public void updateDynamicRawDataToIndex_deviceBonded_deviceIsSearchable() {
when(mDevice.getBondState()).thenReturn(BluetoothDevice.BOND_BONDED); when(mDevice.getBondState()).thenReturn(BluetoothDevice.BOND_BONDED);
List<SearchIndexableRaw> searchData = new ArrayList<>(); List<SearchIndexableRaw> searchData = new ArrayList<>();