diff options
2 files changed, 13 insertions, 5 deletions
diff --git a/packages/SettingsLib/src/com/android/settingslib/bluetooth/HearingAidDeviceManager.java b/packages/SettingsLib/src/com/android/settingslib/bluetooth/HearingAidDeviceManager.java index 4094ce8f708a..3a15b7108e3f 100644 --- a/packages/SettingsLib/src/com/android/settingslib/bluetooth/HearingAidDeviceManager.java +++ b/packages/SettingsLib/src/com/android/settingslib/bluetooth/HearingAidDeviceManager.java @@ -26,6 +26,7 @@ import android.media.AudioDeviceAttributes; import android.media.audiopolicy.AudioProductStrategy; import android.os.ParcelUuid; import android.provider.Settings; +import android.util.FeatureFlagUtils; import android.util.Log; import com.android.internal.annotations.VisibleForTesting; @@ -42,11 +43,13 @@ public class HearingAidDeviceManager { private static final boolean DEBUG = BluetoothUtils.D; private final ContentResolver mContentResolver; + private final Context mContext; private final LocalBluetoothManager mBtManager; private final List<CachedBluetoothDevice> mCachedDevices; private final HearingAidAudioRoutingHelper mRoutingHelper; HearingAidDeviceManager(Context context, LocalBluetoothManager localBtManager, List<CachedBluetoothDevice> CachedDevices) { + mContext = context; mContentResolver = context.getContentResolver(); mBtManager = localBtManager; mCachedDevices = CachedDevices; @@ -56,6 +59,7 @@ public class HearingAidDeviceManager { @VisibleForTesting HearingAidDeviceManager(Context context, LocalBluetoothManager localBtManager, List<CachedBluetoothDevice> cachedDevices, HearingAidAudioRoutingHelper routingHelper) { + mContext = context; mContentResolver = context.getContentResolver(); mBtManager = localBtManager; mCachedDevices = cachedDevices; @@ -285,11 +289,13 @@ public class HearingAidDeviceManager { } void onActiveDeviceChanged(CachedBluetoothDevice device) { - if (device.isActiveDevice(BluetoothProfile.HEARING_AID) || device.isActiveDevice( - BluetoothProfile.LE_AUDIO)) { - setAudioRoutingConfig(device); - } else { - clearAudioRoutingConfig(); + if (FeatureFlagUtils.isEnabled(mContext, FeatureFlagUtils.SETTINGS_AUDIO_ROUTING)) { + if (device.isActiveDevice(BluetoothProfile.HEARING_AID) || device.isActiveDevice( + BluetoothProfile.LE_AUDIO)) { + setAudioRoutingConfig(device); + } else { + clearAudioRoutingConfig(); + } } } diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/bluetooth/HearingAidDeviceManagerTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/bluetooth/HearingAidDeviceManagerTest.java index ea10944be0e9..24fd06e51418 100644 --- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/bluetooth/HearingAidDeviceManagerTest.java +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/bluetooth/HearingAidDeviceManagerTest.java @@ -42,6 +42,7 @@ import android.media.AudioDeviceInfo; import android.media.AudioManager; import android.media.audiopolicy.AudioProductStrategy; import android.os.Parcel; +import android.util.FeatureFlagUtils; import androidx.test.core.app.ApplicationProvider; @@ -109,6 +110,7 @@ public class HearingAidDeviceManagerTest { @Before public void setUp() { + FeatureFlagUtils.setEnabled(mContext, FeatureFlagUtils.SETTINGS_AUDIO_ROUTING, true); when(mDevice1.getAddress()).thenReturn(DEVICE_ADDRESS_1); when(mDevice2.getAddress()).thenReturn(DEVICE_ADDRESS_2); when(mDevice1.getName()).thenReturn(DEVICE_NAME_1); |