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

Commit 851e2a4d authored by Muhammed Siju's avatar Muhammed Siju Committed by Automerger Merge Worker
Browse files

Disable Le Audio communication flag before notifying audio lost am: b0cf588d... 

Disable Le Audio communication flag before notifying audio lost am: b0cf588d am: abf4c6b7 am: d1342ac0 am: 2960c667

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



Change-Id: I52bfbddc9cfe215898bf7ed80b12fb96682bc85d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 422641ff 2960c667

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

+3 −6
Original line number Diff line number Diff line
@@ -420,10 +420,9 @@ public class BluetoothDeviceManager { 
        if (!mLeAudioSetAsCommunicationDevice) {

            return;

        }



        mLeAudioSetAsCommunicationDevice = false;

        if (mAudioManager == null) {

            Log.i(this, "clearLeAudioCommunicationDevice: mAudioManager is null");

            mLeAudioSetAsCommunicationDevice = false;

            return;

        }

        if (mAudioManager.getCommunicationDevice() != null
@@ -432,24 +431,22 @@ public class BluetoothDeviceManager { 
            mBluetoothRouteManager.onAudioLost(mAudioManager.getCommunicationDevice().getAddress());

            mAudioManager.clearCommunicationDevice();

        }

        mLeAudioSetAsCommunicationDevice = false;

    }



    public void clearHearingAidCommunicationDevice() {

        if (!mHearingAidSetAsCommunicationDevice) {

            return;

        }



        mHearingAidSetAsCommunicationDevice = false;

        if (mAudioManager == null) {

            Log.i(this, "clearHearingAidCommunicationDevice: mAudioManager is null");

            mHearingAidSetAsCommunicationDevice = false;

            return;

        }

        if (mAudioManager.getCommunicationDevice() != null

                && mAudioManager.getCommunicationDevice().getType()

                == AudioDeviceInfo.TYPE_HEARING_AID) {

            mAudioManager.clearCommunicationDevice();

        }

        mHearingAidSetAsCommunicationDevice = false;

    }



    public boolean setLeAudioCommunicationDevice() {