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

Commit 323faab5 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Re-add return statements accidentally removed in aosp/2461534" am: 805a89bf 

Original change: https://android-review.googlesource.com/c/platform/packages/services/Telecomm/+/2622611



Change-Id: Id56b2ce5edeedf5280412533fd71b3fa39014909
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 8759d8a9 805a89bf

src/com/android/server/telecom/bluetooth/BluetoothDeviceManager.java

+2 −0
Original line number Original line Diff line number Diff line
@@ -660,6 +660,7 @@ public class BluetoothDeviceManager { 
                if (!switchingBtDevices) {

                if (!switchingBtDevices) {

                    return setLeAudioCommunicationDevice();

                    return setLeAudioCommunicationDevice();

                }

                }

                return true;

            }

            }

            return false;

            return false;

        } else if (callProfile == BluetoothProfile.HEARING_AID) {

        } else if (callProfile == BluetoothProfile.HEARING_AID) {
@@ -670,6 +671,7 @@ public class BluetoothDeviceManager { 
                if (!switchingBtDevices) {

                if (!switchingBtDevices) {

                    return setHearingAidCommunicationDevice();

                    return setHearingAidCommunicationDevice();

                }

                }

                return true;

            }

            }

            return false;

            return false;

        } else if (callProfile == BluetoothProfile.HEADSET) {

        } else if (callProfile == BluetoothProfile.HEADSET) {