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

Commit a14bf118 authored by Eric Laurent's avatar Eric Laurent Committed by Automerger Merge Worker
Browse files

Merge changes from topic "fix-b-255477173-aptx-formats" am: 4872186e am: 526354de 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2277189



Change-Id: Iea9e849a1d7b68b869e8f50a6a3b5cae1d46086b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 40fd5afd 526354de

media/java/android/media/AudioSystem.java

+4 −0
Original line number Diff line number Diff line
@@ -448,6 +448,10 @@ public class AudioSystem 
                return "AUDIO_FORMAT_DTS_UHD";

            case /* AUDIO_FORMAT_DRA             */ 0x2F000000:

                return "AUDIO_FORMAT_DRA";

            case /* AUDIO_FORMAT_APTX_ADAPTIVE_QLEA */ 0x30000000:

                return "AUDIO_FORMAT_APTX_ADAPTIVE_QLEA";

            case /* AUDIO_FORMAT_APTX_ADAPTIVE_R4   */ 0x31000000:

                return "AUDIO_FORMAT_APTX_ADAPTIVE_R4";



            /* Aliases */

            case /* AUDIO_FORMAT_PCM_16_BIT        */ 0x1: