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
This commit is contained in:
timhypeng
2020-09-01 15:28:59 +08:00
committed by Chienyuan
parent f5fa52884b
commit a45a0e8980
2 changed files with 6 additions and 2 deletions

View File

@@ -16,6 +16,8 @@
package com.android.settings.development.bluetooth; package com.android.settings.development.bluetooth;
import static android.bluetooth.BluetoothCodecConfig.CODEC_PRIORITY_HIGHEST;
import android.bluetooth.BluetoothA2dp; import android.bluetooth.BluetoothA2dp;
import android.bluetooth.BluetoothCodecConfig; import android.bluetooth.BluetoothCodecConfig;
import android.bluetooth.BluetoothCodecStatus; import android.bluetooth.BluetoothCodecStatus;
@@ -113,7 +115,7 @@ public abstract class AbstractBluetoothDialogPreferenceController extends
mBluetoothA2dpConfigStore.setSampleRate(config.getSampleRate()); mBluetoothA2dpConfigStore.setSampleRate(config.getSampleRate());
mBluetoothA2dpConfigStore.setBitsPerSample(config.getBitsPerSample()); mBluetoothA2dpConfigStore.setBitsPerSample(config.getBitsPerSample());
mBluetoothA2dpConfigStore.setChannelMode(config.getChannelMode()); mBluetoothA2dpConfigStore.setChannelMode(config.getChannelMode());
mBluetoothA2dpConfigStore.setCodecPriority(config.getCodecPriority()); mBluetoothA2dpConfigStore.setCodecPriority(CODEC_PRIORITY_HIGHEST);
mBluetoothA2dpConfigStore.setCodecSpecific1Value(config.getCodecSpecific1()); mBluetoothA2dpConfigStore.setCodecSpecific1Value(config.getCodecSpecific1());
} }

View File

@@ -16,6 +16,8 @@
package com.android.settings.development.bluetooth; package com.android.settings.development.bluetooth;
import static android.bluetooth.BluetoothCodecConfig.CODEC_PRIORITY_HIGHEST;
import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Mockito.never; import static org.mockito.Mockito.never;
@@ -199,7 +201,7 @@ public class AbstractBluetoothDialogPreferenceControllerTest {
verify(mBluetoothA2dpConfigStore).setSampleRate(mCodecConfigAAC.getSampleRate()); verify(mBluetoothA2dpConfigStore).setSampleRate(mCodecConfigAAC.getSampleRate());
verify(mBluetoothA2dpConfigStore).setBitsPerSample(mCodecConfigAAC.getBitsPerSample()); verify(mBluetoothA2dpConfigStore).setBitsPerSample(mCodecConfigAAC.getBitsPerSample());
verify(mBluetoothA2dpConfigStore).setChannelMode(mCodecConfigAAC.getChannelMode()); verify(mBluetoothA2dpConfigStore).setChannelMode(mCodecConfigAAC.getChannelMode());
verify(mBluetoothA2dpConfigStore).setCodecPriority(mCodecConfigAAC.getCodecPriority()); verify(mBluetoothA2dpConfigStore).setCodecPriority(CODEC_PRIORITY_HIGHEST);
verify(mBluetoothA2dpConfigStore).setCodecSpecific1Value( verify(mBluetoothA2dpConfigStore).setCodecSpecific1Value(
mCodecConfigAAC.getCodecSpecific1()); mCodecConfigAAC.getCodecSpecific1());
} }