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

Commit 90feee59 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "LeAudio: Fix audio modes priority" into tm-qpr-dev

parents 10a908cf 4e29fd6a

system/bta/le_audio/client.cc

+4 −2
Original line number Diff line number Diff line
@@ -748,14 +748,15 @@ class LeAudioClientImpl : public LeAudioClient { 
          /* Highest priority first */

          LeAudioContextType::CONVERSATIONAL,

          LeAudioContextType::RINGTONE,

          LeAudioContextType::GAME,

          LeAudioContextType::LIVE,

          LeAudioContextType::VOICEASSISTANTS,

          LeAudioContextType::GAME,

          LeAudioContextType::MEDIA,

          LeAudioContextType::EMERGENCYALARM,

          LeAudioContextType::ALERTS,

          LeAudioContextType::INSTRUCTIONAL,

          LeAudioContextType::NOTIFICATIONS,

          LeAudioContextType::SOUNDEFFECTS,

      };

      for (auto ct : context_priority_list) {

        if (metadata_context_type.test(ct)) {
@@ -3508,14 +3509,15 @@ class LeAudioClientImpl : public LeAudioClient { 
           * call volume slider while not in a call.

           * LeAudioContextType::RINGTONE,

           */

          LeAudioContextType::GAME,

          LeAudioContextType::LIVE,

          LeAudioContextType::VOICEASSISTANTS,

          LeAudioContextType::GAME,

          LeAudioContextType::MEDIA,

          LeAudioContextType::EMERGENCYALARM,

          LeAudioContextType::ALERTS,

          LeAudioContextType::INSTRUCTIONAL,

          LeAudioContextType::NOTIFICATIONS,

          LeAudioContextType::SOUNDEFFECTS,

      };

      for (auto ct : context_priority_list) {

        if (available_remote_contexts.test(ct)) {