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

Commit 4c4a4e4d authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge changes I0bcfcc83,I96f7eb8f am: 88938096 am: 9d09a74b am: ae6c68ed... 

Merge changes I0bcfcc83,I96f7eb8f am: 88938096 am: 9d09a74b am: ae6c68ed am: d3687734 am: 8540e954

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2185623



Change-Id: I1bc37b7d1b7428de2c7e0f98c32f8b1d34db2030
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ff6bb97b 8540e954

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",