Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 59484908 authored by tim peng's avatar tim peng Committed by Gerrit Code Review
Browse files

Merge "Set highest priority as default value to Bluetooth codec"

parents 9d4bc729 a45a0e89

src/com/android/settings/development/bluetooth/AbstractBluetoothDialogPreferenceController.java

+3 −1
Original line number Diff line number Diff line
@@ -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());

    }

tests/robotests/src/com/android/settings/development/bluetooth/AbstractBluetoothDialogPreferenceControllerTest.java

+3 −1
Original line number Diff line number Diff line
@@ -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());

    }