Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4dfe488d authored by yqian's avatar yqian Committed by Yuanru Qian
Browse files

[Cleanup] remove flag enable_bonded_bluetooth_device_searchable 

the feature is enabled in prod already

Test: atest ConnectedDeviceGroupControllerTest
Bug: N/A
Change-Id: I7b2674bd42ed0a3bbe03c74ff52c3ccd830178dc
Flag: EXEMPT just cleanup
parent 1436ea13

aconfig/settings_connecteddevice_flag_declarations.aconfig

+0 −10
Original line number Diff line number Diff line
@@ -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"

src/com/android/settings/connecteddevice/ConnectedDeviceGroupController.java

+0 −4
Original line number Diff line number Diff line
@@ -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<SearchIndexableRaw> rawData) {

        if (!Flags.enableBondedBluetoothDeviceSearchable()) {

            return;

        }

        if (mLocalBluetoothManager == null) {

            Log.d(TAG, "Bluetooth is not supported");

            return;

tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceGroupControllerTest.java

+0 −2
Original line number Diff line number Diff line
@@ -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<SearchIndexableRaw> 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<SearchIndexableRaw> searchData = new ArrayList<>();