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

Commit 88938096 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge changes I0bcfcc83,I96f7eb8f 

* changes:
  Broadcaster: Fix atest running wrong unit tests
  LeAudioTestApp: Allow for short broadcast codes
parents 3cfa177b 1397a8eb

android/leaudio/app/src/main/java/com/android/bluetooth/leaudio/BroadcastScanActivity.java

+2 −1
Original line number Diff line number Diff line
@@ -112,7 +112,8 @@ public class BroadcastScanActivity extends AppCompatActivity { 
                                       + broadcastId, Toast.LENGTH_SHORT).show();

                        metadata = builder.setEncrypted(false).build();

                    } else {

                        if (code_input_text.getText().length() != 16) {

                        if ((code_input_text.getText().length() > 16) ||

                                (code_input_text.getText().length() < 4)) {

                            Toast.makeText(recyclerView.getContext(),

                                           "Invalid Broadcast code length",

                                           Toast.LENGTH_SHORT).show();

system/bta/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -694,7 +694,7 @@ cc_test { 
}



cc_test {

    name: "bluetooth_test_broadcaster_sm",

    name: "bluetooth_test_broadcaster_state_machine",

    test_suites: ["device-tests"],

    defaults: [

        "fluoride_bta_defaults",