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

Commit 811f5393 authored by William Escande's avatar William Escande Committed by Automerger Merge Worker
Browse files

Merge "Add system properties to config audio codec priority" am: 0a43ce3b am: 43327b59 

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2455512



Change-Id: I72dae3387aa85d5dd5f124637c40a5146055d9db
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4225abfc 43327b59

android/app/src/com/android/bluetooth/a2dp/A2dpCodecConfig.java

+19 −6
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ import android.content.Context; 
import android.content.res.Resources;

import android.content.res.Resources.NotFoundException;

import android.media.AudioManager;

import android.os.SystemProperties;

import android.util.Log;



import com.android.bluetooth.R;
@@ -189,7 +190,9 @@ class A2dpCodecConfig { 


        int value;

        try {

            value = resources.getInteger(R.integer.a2dp_source_codec_priority_sbc);

            value = SystemProperties.getInt(

                "bluetooth.a2dp.source.sbc_priority.config",

                resources.getInteger(R.integer.a2dp_source_codec_priority_sbc));

        } catch (NotFoundException e) {

            value = BluetoothCodecConfig.CODEC_PRIORITY_DEFAULT;

        }
@@ -199,7 +202,9 @@ class A2dpCodecConfig { 
        }



        try {

            value = resources.getInteger(R.integer.a2dp_source_codec_priority_aac);

            value = SystemProperties.getInt(

                "bluetooth.a2dp.source.aac_priority.config",

                resources.getInteger(R.integer.a2dp_source_codec_priority_aac));

        } catch (NotFoundException e) {

            value = BluetoothCodecConfig.CODEC_PRIORITY_DEFAULT;

        }
@@ -209,7 +214,9 @@ class A2dpCodecConfig { 
        }



        try {

            value = resources.getInteger(R.integer.a2dp_source_codec_priority_aptx);

            value = SystemProperties.getInt(

                "bluetooth.a2dp.source.aptx_priority.config",

                resources.getInteger(R.integer.a2dp_source_codec_priority_aptx));

        } catch (NotFoundException e) {

            value = BluetoothCodecConfig.CODEC_PRIORITY_DEFAULT;

        }
@@ -219,7 +226,9 @@ class A2dpCodecConfig { 
        }



        try {

            value = resources.getInteger(R.integer.a2dp_source_codec_priority_aptx_hd);

            value = SystemProperties.getInt(

                "bluetooth.a2dp.source.aptx_hd_priority.config",

                resources.getInteger(R.integer.a2dp_source_codec_priority_aptx_hd));

        } catch (NotFoundException e) {

            value = BluetoothCodecConfig.CODEC_PRIORITY_DEFAULT;

        }
@@ -229,7 +238,9 @@ class A2dpCodecConfig { 
        }



        try {

            value = resources.getInteger(R.integer.a2dp_source_codec_priority_ldac);

            value = SystemProperties.getInt(

                "bluetooth.a2dp.source.ldac_priority.config",

                resources.getInteger(R.integer.a2dp_source_codec_priority_ldac));

        } catch (NotFoundException e) {

            value = BluetoothCodecConfig.CODEC_PRIORITY_DEFAULT;

        }
@@ -239,7 +250,9 @@ class A2dpCodecConfig { 
        }



        try {

            value = resources.getInteger(R.integer.a2dp_source_codec_priority_lc3);

            value = SystemProperties.getInt(

                "bluetooth.a2dp.source.lc3_priority.config",

                resources.getInteger(R.integer.a2dp_source_codec_priority_lc3));

        } catch (NotFoundException e) {

            value = BluetoothCodecConfig.CODEC_PRIORITY_DEFAULT;

        }