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

Commit 08e5382a authored by Jack He's avatar Jack He Committed by Gerrit Code Review
Browse files

Merge changes I0a5ed3c2,Ib4881212 

* changes:
  LeAudioTestApp/Bass: Allow channel selection
  Bass: Fix BIS sync state channel map
parents 624e50d9 84a3384a

android/app/src/com/android/bluetooth/bass_client/BassClientStateMachine.java

+5 −1
Original line number Diff line number Diff line
@@ -1225,7 +1225,11 @@ public class BassClientStateMachine extends StateMachine { 
        int bisSync = 0;

        for (BluetoothLeBroadcastChannel channel : channels) {

            if (channel.isSelected()) {

                bisSync |= 1 << channel.getChannelIndex();

                if (channel.getChannelIndex() == 0) {

                    Log.e(TAG, "getBisSyncFromChannelPreference: invalid channel index=0");

                    continue;

                }

                bisSync |= 1 << (channel.getChannelIndex() - 1);

            }

        }

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

+28 −0
Original line number Diff line number Diff line
@@ -19,7 +19,9 @@ package com.android.bluetooth.leaudio; 


import android.bluetooth.BluetoothAdapter;

import android.bluetooth.BluetoothDevice;

import android.bluetooth.BluetoothLeBroadcastChannel;

import android.bluetooth.BluetoothLeBroadcastMetadata;

import android.bluetooth.BluetoothLeBroadcastSubgroup;

import android.content.Intent;

import android.os.Bundle;

import android.view.LayoutInflater;
@@ -36,6 +38,7 @@ import androidx.recyclerview.widget.LinearLayoutManager; 
import androidx.recyclerview.widget.RecyclerView;



import java.util.Objects;

import java.util.List;





public class BroadcastScanActivity extends AppCompatActivity {
@@ -85,6 +88,10 @@ public class BroadcastScanActivity extends AppCompatActivity { 
                View alertView =

                        inflater.inflate(R.layout.broadcast_scan_add_encrypted_source_dialog,

                                         null);



                final EditText channels_input_text =

                        alertView.findViewById(R.id.broadcast_channel_map);



                final EditText code_input_text =

                        alertView.findViewById(R.id.broadcast_code_input);

                BluetoothLeBroadcastMetadata.Builder builder = new
@@ -119,6 +126,27 @@ public class BroadcastScanActivity extends AppCompatActivity { 
                               .build();

                    }



                    if ((channels_input_text.getText() != null)

                            && (channels_input_text.getText().length() != 0)) {

                        int channelMap = Integer.parseInt(channels_input_text.getText().toString());

                        // Apply a single channel map preference to all subgroups

                        for (BluetoothLeBroadcastSubgroup subGroup : metadata.getSubgroups()) {

                            List<BluetoothLeBroadcastChannel> channels = subGroup.getChannels();

                            for (int i = 0; i < channels.size(); i++) {

                                BluetoothLeBroadcastChannel channel = channels.get(i);

                                // Set the channel preference value according to the map

                                if (channel.getChannelIndex() != 0) {

                                    if ((channelMap & (1 << (channel.getChannelIndex() - 1))) != 0) {

                                        BluetoothLeBroadcastChannel.Builder bob

                                                = new BluetoothLeBroadcastChannel.Builder(channel);

                                        bob.setSelected(true);

                                        channels.set(i, bob.build());

                                    }

                                }

                            }

                        }

                    }



                    Toast.makeText(recyclerView.getContext(), "Adding broadcast source"

                                    + " broadcastId=" + broadcastId, Toast.LENGTH_SHORT).show();

                    mViewModel.addBroadcastSource(device, metadata);

android/leaudio/app/src/main/res/layout/broadcast_scan_add_encrypted_source_dialog.xml

+21 −0
Original line number Diff line number Diff line
@@ -29,4 +29,25 @@ 
            android:inputType="textMultiLine|textFilter" />

    </LinearLayout>



    <LinearLayout

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:orientation="horizontal">



        <TextView

            android:id="@+id/textViewChannelMap"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_weight="1"

            android:text="Channel Map:" />

        <EditText

            android:id="@+id/broadcast_channel_map"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_weight="2"

            android:digits="123456789"

            android:inputType="number"

            android:maxLength="3"/>

    </LinearLayout>



</LinearLayout>