Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Integration of the AAC codec for A2DP source"

Browse Source
This commit is contained in:
Treehugger Robot
2017-01-26 19:12:54 +00:00
committed by Gerrit Code Review
parent 2c1e396382 b33bd5bc2e
commit 22f97c83fb
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/java/android/bluetooth/BluetoothCodecConfig.java
View File

@@ -51,9 +51,10 @@ public final class BluetoothCodecConfig implements Parcelable {
// NOTE: The values should be same as those listed in the following file:
// hardware/libhardware/include/hardware/bt_av.h
public static final int SOURCE_CODEC_TYPE_SBC = 0;
public static final int SOURCE_CODEC_TYPE_APTX = 1;
public static final int SOURCE_CODEC_TYPE_APTX_HD = 2;
public static final int SOURCE_CODEC_TYPE_LDAC = 3;
public static final int SOURCE_CODEC_TYPE_AAC = 1;
public static final int SOURCE_CODEC_TYPE_APTX = 2;
public static final int SOURCE_CODEC_TYPE_APTX_HD = 3;
public static final int SOURCE_CODEC_TYPE_LDAC = 4;
public static final int SOURCE_CODEC_TYPE_INVALID = 1000 * 1000;

3
packages/SettingsLib/res/values/arrays.xml
View File

@@ -107,6 +107,7 @@
<string-array name="bluetooth_a2dp_codec_titles">
<item>Use System Selection (Default)</item>
<item>SBC</item>
<item>AAC</item>
<item>aptX</item>
<item>aptX HD</item>
<item>LDAC</item>
@@ -119,12 +120,14 @@
<item>1</item>
<item>2</item>
<item>3</item>
<item>4</item>
</string-array>
<!-- Summaries for Bluetooth Audio Codec selection preference. [CHAR LIMIT=40]-->
<string-array name="bluetooth_a2dp_codec_summaries" >
<item>Use System Selection (Default)</item>
<item>SBC</item>
<item>AAC</item>
<item>aptX</item>
<item>aptX HD</item>
<item>LDAC</item>