Remove flag enable_hearing_aid_preset_control
Flag: EXEMPT remove flag Bug: 388175226 Test: atest BluetoothDetailsHearingDeviceControllerTest Change-Id: I97b633f32794feb86e5a940448270ed74ed26387
This commit is contained in:
@@ -22,7 +22,6 @@ import androidx.annotation.NonNull;
|
|||||||
import androidx.preference.PreferenceFragmentCompat;
|
import androidx.preference.PreferenceFragmentCompat;
|
||||||
import androidx.preference.PreferenceScreen;
|
import androidx.preference.PreferenceScreen;
|
||||||
|
|
||||||
import com.android.settings.accessibility.Flags;
|
|
||||||
import com.android.settingslib.bluetooth.CachedBluetoothDevice;
|
import com.android.settingslib.bluetooth.CachedBluetoothDevice;
|
||||||
import com.android.settingslib.bluetooth.LocalBluetoothManager;
|
import com.android.settingslib.bluetooth.LocalBluetoothManager;
|
||||||
import com.android.settingslib.core.lifecycle.Lifecycle;
|
import com.android.settingslib.core.lifecycle.Lifecycle;
|
||||||
@@ -107,10 +106,8 @@ public class BluetoothDetailsHearingDeviceController extends BluetoothDetailsCon
|
|||||||
mControllers.add(new BluetoothDetailsHearingDeviceSettingsController(mContext,
|
mControllers.add(new BluetoothDetailsHearingDeviceSettingsController(mContext,
|
||||||
mFragment, mCachedDevice, mLifecycle));
|
mFragment, mCachedDevice, mLifecycle));
|
||||||
}
|
}
|
||||||
if (Flags.enableHearingAidPresetControl()) {
|
|
||||||
mControllers.add(new BluetoothDetailsHearingAidsPresetsController(mContext, mFragment,
|
mControllers.add(new BluetoothDetailsHearingAidsPresetsController(mContext, mFragment,
|
||||||
mManager, mCachedDevice, mLifecycle));
|
mManager, mCachedDevice, mLifecycle));
|
||||||
}
|
|
||||||
if (com.android.settingslib.flags.Flags.hearingDevicesAmbientVolumeControl()) {
|
if (com.android.settingslib.flags.Flags.hearingDevicesAmbientVolumeControl()) {
|
||||||
mControllers.add(new BluetoothDetailsAmbientVolumePreferenceController(mContext,
|
mControllers.add(new BluetoothDetailsAmbientVolumePreferenceController(mContext,
|
||||||
mManager, mFragment, mCachedDevice, mLifecycle));
|
mManager, mFragment, mCachedDevice, mLifecycle));
|
||||||
|
@@ -25,7 +25,6 @@ import android.platform.test.annotations.RequiresFlagsEnabled;
|
|||||||
import android.platform.test.flag.junit.CheckFlagsRule;
|
import android.platform.test.flag.junit.CheckFlagsRule;
|
||||||
import android.platform.test.flag.junit.DeviceFlagsValueProvider;
|
import android.platform.test.flag.junit.DeviceFlagsValueProvider;
|
||||||
|
|
||||||
import com.android.settings.accessibility.Flags;
|
|
||||||
import com.android.settingslib.bluetooth.LocalBluetoothManager;
|
import com.android.settingslib.bluetooth.LocalBluetoothManager;
|
||||||
import com.android.settingslib.bluetooth.LocalBluetoothProfileManager;
|
import com.android.settingslib.bluetooth.LocalBluetoothProfileManager;
|
||||||
|
|
||||||
@@ -119,23 +118,13 @@ public class BluetoothDetailsHearingDeviceControllerTest extends
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
@RequiresFlagsEnabled(Flags.FLAG_ENABLE_HEARING_AID_PRESET_CONTROL)
|
public void initSubControllers_presetControllerExist() {
|
||||||
public void initSubControllers_flagEnabled_presetControllerExist() {
|
|
||||||
mHearingDeviceController.initSubControllers(false);
|
mHearingDeviceController.initSubControllers(false);
|
||||||
|
|
||||||
assertThat(mHearingDeviceController.getSubControllers().stream().anyMatch(
|
assertThat(mHearingDeviceController.getSubControllers().stream().anyMatch(
|
||||||
c -> c instanceof BluetoothDetailsHearingAidsPresetsController)).isTrue();
|
c -> c instanceof BluetoothDetailsHearingAidsPresetsController)).isTrue();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
|
||||||
@RequiresFlagsDisabled(Flags.FLAG_ENABLE_HEARING_AID_PRESET_CONTROL)
|
|
||||||
public void initSubControllers_flagDisabled_presetControllerNotExist() {
|
|
||||||
mHearingDeviceController.initSubControllers(false);
|
|
||||||
|
|
||||||
assertThat(mHearingDeviceController.getSubControllers().stream().anyMatch(
|
|
||||||
c -> c instanceof BluetoothDetailsHearingAidsPresetsController)).isFalse();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
@RequiresFlagsEnabled(
|
@RequiresFlagsEnabled(
|
||||||
com.android.settingslib.flags.Flags.FLAG_HEARING_DEVICES_AMBIENT_VOLUME_CONTROL)
|
com.android.settingslib.flags.Flags.FLAG_HEARING_DEVICES_AMBIENT_VOLUME_CONTROL)
|
||||||
|
Reference in New Issue
Block a user