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

Commit deb4550a authored by Jakub Pawlowski's avatar Jakub Pawlowski Committed by Automerger Merge Worker
Browse files

Merge "Store LE Audio device connection/disconnection" am: 92425eab am: abe88f3b am: dc7e92da 

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

Change-Id: I1068a102c64421205c477cb347b50218cfb03490
parents 9a95406e dc7e92da

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

+15 −1
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ import android.bluetooth.BluetoothAdapter; 
import android.bluetooth.BluetoothDevice;

import android.bluetooth.BluetoothHeadset;

import android.bluetooth.BluetoothHearingAid;

import android.bluetooth.BluetoothLeAudio;

import android.bluetooth.BluetoothProfile;

import android.bluetooth.BluetoothUuid;

import android.content.BroadcastReceiver;
@@ -117,6 +118,11 @@ class PhonePolicy { 
                            BluetoothProfile.A2DP, -1, // No-op argument

                            intent).sendToTarget();

                    break;

                case BluetoothLeAudio.ACTION_LE_AUDIO_CONNECTION_STATE_CHANGED:

                    mHandler.obtainMessage(MESSAGE_PROFILE_CONNECTION_STATE_CHANGED,

                            BluetoothProfile.LE_AUDIO, -1, // No-op argument

                            intent).sendToTarget();

                    break;

                case BluetoothA2dp.ACTION_ACTIVE_DEVICE_CHANGED:

                    mHandler.obtainMessage(MESSAGE_PROFILE_ACTIVE_DEVICE_CHANGED,

                            BluetoothProfile.A2DP, -1, // No-op argument
@@ -132,6 +138,11 @@ class PhonePolicy { 
                            BluetoothProfile.HEARING_AID, -1, // No-op argument

                            intent).sendToTarget();

                    break;

                case BluetoothLeAudio.ACTION_LE_AUDIO_ACTIVE_DEVICE_CHANGED:

                    mHandler.obtainMessage(MESSAGE_PROFILE_ACTIVE_DEVICE_CHANGED,

                            BluetoothProfile.LE_AUDIO, -1, // No-op argument

                            intent).sendToTarget();

                    break;

                case BluetoothAdapter.ACTION_STATE_CHANGED:

                    // Only pass the message on if the adapter has actually changed state from

                    // non-ON to ON. NOTE: ON is the state depicting BREDR ON and not just BLE ON.
@@ -230,12 +241,14 @@ class PhonePolicy { 
        IntentFilter filter = new IntentFilter();

        filter.addAction(BluetoothHeadset.ACTION_CONNECTION_STATE_CHANGED);

        filter.addAction(BluetoothA2dp.ACTION_CONNECTION_STATE_CHANGED);

        filter.addAction(BluetoothLeAudio.ACTION_LE_AUDIO_CONNECTION_STATE_CHANGED);

        filter.addAction(BluetoothDevice.ACTION_ACL_CONNECTED);

        filter.addAction(BluetoothDevice.ACTION_UUID);

        filter.addAction(BluetoothAdapter.ACTION_STATE_CHANGED);

        filter.addAction(BluetoothA2dp.ACTION_ACTIVE_DEVICE_CHANGED);

        filter.addAction(BluetoothHeadset.ACTION_ACTIVE_DEVICE_CHANGED);

        filter.addAction(BluetoothHearingAid.ACTION_ACTIVE_DEVICE_CHANGED);

        filter.addAction(BluetoothLeAudio.ACTION_LE_AUDIO_ACTIVE_DEVICE_CHANGED);

        mAdapterService.registerReceiver(mReceiver, filter);

    }
@@ -312,7 +325,8 @@ class PhonePolicy { 
            int prevState) {

        debugLog("processProfileStateChanged, device=" + device + ", profile=" + profileId + ", "

                + prevState + " -> " + nextState);

        if (((profileId == BluetoothProfile.A2DP) || (profileId == BluetoothProfile.HEADSET))) {

        if (((profileId == BluetoothProfile.A2DP) || (profileId == BluetoothProfile.HEADSET)

                || (profileId == BluetoothProfile.LE_AUDIO))) {

            if (nextState == BluetoothProfile.STATE_CONNECTED) {

                switch (profileId) {

                    case BluetoothProfile.A2DP:

android/app/src/com/android/bluetooth/btservice/storage/DatabaseManager.java

+2 −0
Original line number Diff line number Diff line
@@ -873,6 +873,8 @@ public class DatabaseManager { 
            data.setProfileConnectionPolicy(BluetoothProfile.SAP, sapConnectionPolicy);

            data.setProfileConnectionPolicy(BluetoothProfile.HEARING_AID,

                    hearingaidConnectionPolicy);

            data.setProfileConnectionPolicy(BluetoothProfile.LE_AUDIO,

                    BluetoothProfile.CONNECTION_POLICY_UNKNOWN);

            data.a2dpSupportsOptionalCodecs = a2dpSupportsOptionalCodec;

            data.a2dpOptionalCodecsEnabled = a2dpOptionalCodecEnabled;

            mMetadataCache.put(address, data);