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

Commit a8f0a078 authored by William Escande's avatar William Escande Committed by Gerrit Code Review
Browse files

Merge "AudioRoutingManager: Fix flaky test" into main

parents 6e7b0f06 7ab88334

android/app/src/com/android/bluetooth/a2dp/A2dpService.java

+2 −1
Original line number Diff line number Diff line
@@ -1398,7 +1398,8 @@ public class A2dpService extends ProfileService { 
            }

            if (Flags.audioRoutingCentralization()) {

                return ((AudioRoutingManager) service.getActiveDeviceManager())

                        .activateDeviceProfile(device, BluetoothProfile.A2DP);

                        .activateDeviceProfile(device, BluetoothProfile.A2DP)

                        .join();

            }



            if (device == null) {

android/app/src/com/android/bluetooth/btservice/AudioRoutingManager.java

+2 −2
Original line number Diff line number Diff line
@@ -101,7 +101,7 @@ public class AudioRoutingManager extends ActiveDeviceManager { 
     * @param profile The profile to be activated

     * @param receiver to post the results

     */

    public boolean activateDeviceProfile(BluetoothDevice device, int profile) {

    public CompletableFuture<Boolean> activateDeviceProfile(BluetoothDevice device, int profile) {

        CompletableFuture<Boolean> future = new CompletableFuture<>();



        mHandler.post(
@@ -109,7 +109,7 @@ public class AudioRoutingManager extends ActiveDeviceManager { 
                        future.complete(

                                mHandler.activateDeviceProfile(

                                        mHandler.getAudioRoutingDevice(device), profile)));

        return future.join();

        return future;

    }



    /**

android/app/src/com/android/bluetooth/hearingaid/HearingAidService.java

+2 −1
Original line number Diff line number Diff line
@@ -994,7 +994,8 @@ public class HearingAidService extends ProfileService { 


            if (Flags.audioRoutingCentralization()) {

                return ((AudioRoutingManager) service.mAdapterService.getActiveDeviceManager())

                        .activateDeviceProfile(device, BluetoothProfile.HEARING_AID);

                        .activateDeviceProfile(device, BluetoothProfile.HEARING_AID)

                        .join();

            }

            if (device == null) {

                return service.removeActiveDevice(false);

android/app/src/com/android/bluetooth/hfp/HeadsetService.java

+2 −1
Original line number Diff line number Diff line
@@ -782,7 +782,8 @@ public class HeadsetService extends ProfileService { 


            if (Flags.audioRoutingCentralization()) {

                return ((AudioRoutingManager) service.mAdapterService.getActiveDeviceManager())

                        .activateDeviceProfile(device, BluetoothProfile.HEADSET);

                        .activateDeviceProfile(device, BluetoothProfile.HEADSET)

                        .join();

            }



            return service.setActiveDevice(device);

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

+2 −1
Original line number Diff line number Diff line
@@ -4393,7 +4393,8 @@ public class LeAudioService extends ProfileService { 


            if (Flags.audioRoutingCentralization()) {

                return ((AudioRoutingManager) service.mAdapterService.getActiveDeviceManager())

                        .activateDeviceProfile(device, BluetoothProfile.LE_AUDIO);

                        .activateDeviceProfile(device, BluetoothProfile.LE_AUDIO)

                        .join();

            }

            if (device == null) {

                return service.removeActiveDevice(true);