| commit | 0c786c8321bb2132c1d2356c7af93456e8b5d0a4 | [log] [tgz] |
|---|---|---|
| author | tim peng <timhypeng@google.com> | Thu Sep 24 13:21:55 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Sep 24 13:21:55 2020 +0000 |
| tree | b8e36e88be0dc6798df4401198722747a2af5242 | |
| parent | d2f2f4b13e004f3d6e56e0c7da701e20da5ff5f0 [diff] | |
| parent | 3501adcc86cffc004124e315ebc732dbaa6bcc50 [diff] |
Merge "Set highest priority as default value to Bluetooth codec" am: 594849082b am: d3a9f472a2 am: f01d260512 am: 3501adcc86 Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1435258 Change-Id: I336bae8e93101a682eea6b51f08c52fb83cc1fc9
diff --git a/src/com/android/settings/development/bluetooth/AbstractBluetoothDialogPreferenceController.java b/src/com/android/settings/development/bluetooth/AbstractBluetoothDialogPreferenceController.java index 6bc9175..d66b8d8 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 @@ 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 afb1778..a12131d 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 @@ 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()); }