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

Commit 0f959a5b authored by Sungsoo Lim's avatar Sungsoo Lim Committed by Automerger Merge Worker
Browse files

Merge "Activate A2DP and HFP together if available" am: d0e2839c 

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



Change-Id: Ie759ef448179252947ac6b1f98d43cdf16c6b455
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents fa50f555 d0e2839c

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

+6 −0
Original line number Diff line number Diff line
@@ -314,6 +314,9 @@ class ActiveDeviceManager { 
                        setHearingAidActiveDevice(null);

                        setLeAudioActiveDevice(null);

                    }

                    if (mHfpConnectedDevices.contains(device)) {

                        setHfpActiveDevice(device);

                    }

                    // Just assign locally the new value

                    mA2dpActiveDevice = device;

                }
@@ -398,6 +401,9 @@ class ActiveDeviceManager { 
                        setHearingAidActiveDevice(null);

                        setLeAudioActiveDevice(null);

                    }

                    if (mA2dpConnectedDevices.contains(device)) {

                        setA2dpActiveDevice(device);

                    }

                    // Just assign locally the new value

                    mHfpActiveDevice = device;

                }