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

Commit d9fe7d87 authored by Jack He's avatar Jack He Committed by Automerger Merge Worker
Browse files

Merge changes from topic "fix-cts-2" into tm-dev am: d0bd88ef 

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



Change-Id: Ieeb62c9dda847e107d48790e6f30f1d9cce2c161
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 47113398 d0bd88ef

framework/java/android/bluetooth/BluetoothLeBroadcastReceiveState.java

+5 −2
Original line number Diff line number Diff line
@@ -224,9 +224,12 @@ public final class BluetoothLeBroadcastReceiveState implements Parcelable { 
            throw new IllegalArgumentException("subgroupMetadata.size()  "

                    + subgroupMetadata.size() + " must be equal to numSubgroups " + numSubgroups);

        }

        if (paSyncState != PA_SYNC_STATE_IDLE && paSyncState != PA_SYNC_STATE_SYNCINFO_REQUEST

        if (paSyncState != PA_SYNC_STATE_IDLE

                && paSyncState != PA_SYNC_STATE_SYNCINFO_REQUEST

                && paSyncState != PA_SYNC_STATE_SYNCHRONIZED

                && paSyncState != PA_SYNC_STATE_FAILED_TO_SYNCHRONIZE

                && paSyncState != PA_SYNC_STATE_NO_PAST && paSyncState != PA_SYNC_STATE_INVALID) {

                && paSyncState != PA_SYNC_STATE_NO_PAST

                && paSyncState != PA_SYNC_STATE_INVALID) {

            throw new IllegalArgumentException("unrecognized paSyncState " + paSyncState);

        }

        if (bigEncryptionState != BIG_ENCRYPTION_STATE_NOT_ENCRYPTED