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

Commit 7e76a98a authored by Yuyang Huang's avatar Yuyang Huang
Browse files

remove early return to make aptx SWB consistent with and without isScoManagedByAudioEnabled 

Bug: 367479598
Bug: 315234036
Flag: com::android::bluetooth::flags::is_sco_managed_by_audio
Test: atest HeadsetStateMachineTest
Change-Id: I09708a66c41444fd3a89969e3220c205ed11c877
parent 15ab20f3

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

+0 −2
Original line number Diff line number Diff line
@@ -1177,7 +1177,6 @@ public class HeadsetService extends ProfileService { 
                            am.setCommunicationDevice(audioDeviceInfo.get());

                            Log.i(TAG, "Audio Manager will initiate the SCO for Voice Recognition");

                        });

                return true;

            } else {

                Log.w(

                        TAG,
@@ -1232,7 +1231,6 @@ public class HeadsetService extends ProfileService { 
                    () -> {

                        mSystemInterface.getAudioManager().clearCommunicationDevice();

                    });

            return true;

        }

        enableSwbCodec(HeadsetHalConstants.BTHF_SWB_CODEC_VENDOR_APTX, false, device);

        return true;