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

Commit b7cde485 authored by Yi Kong's avatar Yi Kong Committed by Automerger Merge Worker
Browse files

Merge "Fix incorrect use of `||` in place of `|`" am: 59579c18 am:... 

Merge "Fix incorrect use of `||` in place of `|`" am: 59579c18 am: 7f8f49f4 am: 2738cbcc am: 1e39ae39

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

Change-Id: Iac6bb89fe4501d4b376c6198c9ff725670468241
parents c5cc7fcd 1e39ae39

system/bta/le_audio/state_machine_test.cc

+1 −1
Original line number Diff line number Diff line
@@ -173,7 +173,7 @@ class StateMachineTest : public Test { 
                         : ((uint16_t)(remote_bda.address[0] ^

                                       remote_bda.address[1] ^

                                       remote_bda.address[2]))

                                   << 8 ||

                                   << 8 |

                               (remote_bda.address[3] ^ remote_bda.address[4] ^

                                remote_bda.address[5]);

            }));