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

Commit 099856a8 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "le_audio: Remove temporary LE audio profile info getter" am: 4edfc104 am: 44509848 

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



Change-Id: Ib7ea9aa55842a738cfb013db08cf4dbbd4ca6d53
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 31bfa063 44509848

android/app/src/com/android/bluetooth/le_audio/LeAudioService.java

+4 −18
Original line number Diff line number Diff line
@@ -1297,7 +1297,8 @@ public class LeAudioService extends ProfileService { 
                    == BluetoothProfile.STATE_CONNECTED);



            mAudioManager.handleBluetoothActiveDeviceChanged(mActiveAudioOutDevice,

                    previousActiveOutDevice, getLeAudioOutputProfile(suppressNoisyIntent, volume));

                    previousActiveOutDevice, BluetoothProfileConnectionInfo.createLeAudioOutputInfo(

                            suppressNoisyIntent, volume));

        }



        if (isNewActiveInDevice) {
@@ -1494,22 +1495,6 @@ public class LeAudioService extends ProfileService { 
        }

    }



    BluetoothProfileConnectionInfo getLeAudioOutputProfile(boolean suppressNoisyIntent,

            int volume) {

        /* TODO - b/236618595 */

        Parcel parcel = Parcel.obtain();

        parcel.writeInt(BluetoothProfile.LE_AUDIO);

        parcel.writeBoolean(suppressNoisyIntent);

        parcel.writeInt(volume);

        parcel.writeBoolean(true /* isLeOutput */);

        parcel.setDataPosition(0);



        BluetoothProfileConnectionInfo profileInfo =

                BluetoothProfileConnectionInfo.CREATOR.createFromParcel(parcel);

        parcel.recycle();

        return profileInfo;

    }



    BluetoothProfileConnectionInfo getBroadcastProfile(boolean suppressNoisyIntent) {

        Parcel parcel = Parcel.obtain();

        parcel.writeInt(BluetoothProfile.LE_AUDIO_BROADCAST);
@@ -2988,7 +2973,8 @@ public class LeAudioService extends ProfileService { 
                    + "change with volume=" + volume + " and suppressNoisyIntent="

                    + suppressNoisyIntent);

            mAudioManager.handleBluetoothActiveDeviceChanged(mActiveAudioOutDevice,

                    mActiveAudioOutDevice, getLeAudioOutputProfile(suppressNoisyIntent, volume));

                    mActiveAudioOutDevice, BluetoothProfileConnectionInfo.createLeAudioOutputInfo(

                            suppressNoisyIntent, volume));

            audioFrameworkCalls++;

        }