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

Commit 5963321d authored by David Duarte's avatar David Duarte Committed by Cherrypicker Worker
Browse files

leaudio_unit_test: Fix handling Prepare Receiver Start Ready 

Looks like in test incorrectly assume that Receiver Start Ready
operations includes metadata.

Bug: 266747029
Test: atest bluetooth_le_audio_test
Tag: #feature
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:72f74dbe6cbaa451ce72b7d503b964fcc29ffb43)
Merged-In: Ie1255575570a03b34dcb85fb68043b9abc1f1522
Change-Id: Ie1255575570a03b34dcb85fb68043b9abc1f1522

NOTE FOR REVIEWERS - original patch and result patch are not identical.
PLEASE REVIEW CAREFULLY.
Diffs between the patches:
113,17 +1113,12 @@
 
             // Once we did the 'ReceiverStartReady' the server goes to
             // Streaming, when in Source role
-            auto meta_len = *ase_p++;
-            auto num_handled_bytes = ase_p - value.data();
-            ase_p += num_handled_bytes;
-
             const auto& ase = &(*it);
-            client_parser::ascs::ase_transient_state_params enable_params = {
-                .metadata = std::vector<uint8_t>(
-                    value.begin() + num_handled_bytes,
-                    value.begin() + num_handled_bytes + meta_len)};
-            InjectAseStateNotification(
-                ase, device, group, ascs::kAseStateStreaming, &enable_params);
+            client_parser::ascs::ase_transient_state_params streaming_params = {
+                .metadata = ase->metadata};
+            InjectAseStateNotification(ase, device, group,
+                                       ascs::kAseStateStreaming,
+                                       &streaming_params);
           }
         };
   }

Original patch:
From 72f74dbe Mon Sep 17 00:00:00 2001
From: Łukasz Rymanowski <rlukasz@google.com>
Date: Fri, 24 Feb 2023 10:36:43 +0000
Subject: [PATCH] leaudio_unit_test: Fix handling Prepare Receiver Start Ready

Looks like in test incorrectly assume that Receiver Start Ready
operations includes metadata.

Bug: 266747029
Test: atest bluetooth_le_audio_test
Tag: #feature
Change-Id: Ie1255575570a03b34dcb85fb68043b9abc1f1522
---
parent 70bee993

system/bta/le_audio/state_machine_test.cc

+5 −10
Original line number Diff line number Diff line
@@ -1113,17 +1113,12 @@ class StateMachineTest : public Test { 


            // Once we did the 'ReceiverStartReady' the server goes to

            // Streaming, when in Source role

            auto meta_len = *ase_p++;

            auto num_handled_bytes = ase_p - value.data();

            ase_p += num_handled_bytes;



            const auto& ase = &(*it);

            client_parser::ascs::ase_transient_state_params enable_params = {

                .metadata = std::vector<uint8_t>(

                    value.begin() + num_handled_bytes,

                    value.begin() + num_handled_bytes + meta_len)};

            InjectAseStateNotification(

                ase, device, group, ascs::kAseStateStreaming, &enable_params);

            client_parser::ascs::ase_transient_state_params streaming_params = {

                .metadata = ase->metadata};

            InjectAseStateNotification(ase, device, group,

                                       ascs::kAseStateStreaming,

                                       &streaming_params);

          }

        };

  }