From a45a0e89806717f5587483843e7a2eada57dfb3b Mon Sep 17 00:00:00 2001 From: timhypeng Date: Tue, 1 Sep 2020 15:28:59 +0800 Subject: [PATCH] Set highest priority as default value to Bluetooth codec -To set highest priority when codec modification comes from development setting Bug: 165442632 Test: make -j42 RunSettingsRoboTests Change-Id: I8cfbaa276f3b3e269f4a80e8aae987fbb90f646e --- .../AbstractBluetoothDialogPreferenceController.java | 4 +++- .../AbstractBluetoothDialogPreferenceControllerTest.java | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/com/android/settings/development/bluetooth/AbstractBluetoothDialogPreferenceController.java b/src/com/android/settings/development/bluetooth/AbstractBluetoothDialogPreferenceController.java index 6bc9175ba8b..d66b8d8dc86 100644 --- a/src/com/android/settings/development/bluetooth/AbstractBluetoothDialogPreferenceController.java +++ b/src/com/android/settings/development/bluetooth/AbstractBluetoothDialogPreferenceController.java @@ -16,6 +16,8 @@ package com.android.settings.development.bluetooth; +import static android.bluetooth.BluetoothCodecConfig.CODEC_PRIORITY_HIGHEST; + import android.bluetooth.BluetoothA2dp; import android.bluetooth.BluetoothCodecConfig; import android.bluetooth.BluetoothCodecStatus; @@ -113,7 +115,7 @@ public abstract class AbstractBluetoothDialogPreferenceController extends mBluetoothA2dpConfigStore.setSampleRate(config.getSampleRate()); mBluetoothA2dpConfigStore.setBitsPerSample(config.getBitsPerSample()); mBluetoothA2dpConfigStore.setChannelMode(config.getChannelMode()); - mBluetoothA2dpConfigStore.setCodecPriority(config.getCodecPriority()); + mBluetoothA2dpConfigStore.setCodecPriority(CODEC_PRIORITY_HIGHEST); mBluetoothA2dpConfigStore.setCodecSpecific1Value(config.getCodecSpecific1()); } diff --git a/tests/robotests/src/com/android/settings/development/bluetooth/AbstractBluetoothDialogPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/bluetooth/AbstractBluetoothDialogPreferenceControllerTest.java index afb1778e40b..a12131d51f6 100644 --- a/tests/robotests/src/com/android/settings/development/bluetooth/AbstractBluetoothDialogPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/bluetooth/AbstractBluetoothDialogPreferenceControllerTest.java @@ -16,6 +16,8 @@ package com.android.settings.development.bluetooth; +import static android.bluetooth.BluetoothCodecConfig.CODEC_PRIORITY_HIGHEST; + import static com.google.common.truth.Truth.assertThat; import static org.mockito.Mockito.never; @@ -199,7 +201,7 @@ public class AbstractBluetoothDialogPreferenceControllerTest { verify(mBluetoothA2dpConfigStore).setSampleRate(mCodecConfigAAC.getSampleRate()); verify(mBluetoothA2dpConfigStore).setBitsPerSample(mCodecConfigAAC.getBitsPerSample()); verify(mBluetoothA2dpConfigStore).setChannelMode(mCodecConfigAAC.getChannelMode()); - verify(mBluetoothA2dpConfigStore).setCodecPriority(mCodecConfigAAC.getCodecPriority()); + verify(mBluetoothA2dpConfigStore).setCodecPriority(CODEC_PRIORITY_HIGHEST); verify(mBluetoothA2dpConfigStore).setCodecSpecific1Value( mCodecConfigAAC.getCodecSpecific1()); }