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

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

Merge changes I711c9fce,Ibd821173 into main am: da4333a8 am: ba8c0748 

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



Change-Id: Id111e9b97252e0f9226b783dee4f44c4e6d857e8
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 867ef644 ba8c0748

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

+29 −0
Original line number Diff line number Diff line
@@ -776,6 +776,7 @@ class AdapterProperties { 
                                        BluetoothAdapter.EXTRA_PREVIOUS_CONNECTION_STATE,

                                        prevAdapterState)

                                .addFlags(Intent.FLAG_RECEIVER_REGISTERED_ONLY_BEFORE_BOOT);

                logProfileConnectionStateChange(device, newState, prevState);

                Log.d(TAG, "updateOnProfileConnectionChanged: " + logInfo);

                mService.sendBroadcastAsUser(

                        intent,
@@ -786,6 +787,34 @@ class AdapterProperties { 
        }

    }



    private void logProfileConnectionStateChange(BluetoothDevice device, int state, int prevState) {



        switch (state) {

            case BluetoothAdapter.STATE_CONNECTED:

                MetricsLogger.getInstance()

                        .logBluetoothEvent(

                                device,

                                BluetoothStatsLog

                                        .BLUETOOTH_CROSS_LAYER_EVENT_REPORTED__EVENT_TYPE__PROFILE_CONNECTION,

                                BluetoothStatsLog

                                        .BLUETOOTH_CROSS_LAYER_EVENT_REPORTED__STATE__SUCCESS,

                                0);

                break;

            case BluetoothAdapter.STATE_DISCONNECTED:

                if (prevState == BluetoothAdapter.STATE_CONNECTING) {

                    MetricsLogger.getInstance()

                            .logBluetoothEvent(

                                    device,

                                    BluetoothStatsLog

                                            .BLUETOOTH_CROSS_LAYER_EVENT_REPORTED__EVENT_TYPE__PROFILE_CONNECTION,

                                    BluetoothStatsLog

                                            .BLUETOOTH_CROSS_LAYER_EVENT_REPORTED__STATE__FAIL,

                                    0);

                }

                break;

        }

    }



    private boolean validateProfileConnectionState(int state) {

        return (state == BluetoothProfile.STATE_DISCONNECTED

                || state == BluetoothProfile.STATE_CONNECTING

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

+7 −0
Original line number Diff line number Diff line
@@ -2884,6 +2884,13 @@ public class AdapterService extends Service { 
                            + device

                            + ", from "

                            + Utils.getUidPidString());

            MetricsLogger.getInstance()

                    .logBluetoothEvent(

                            device,

                            BluetoothStatsLog

                                    .BLUETOOTH_CROSS_LAYER_EVENT_REPORTED__EVENT_TYPE__INITIATOR_CONNECTION,

                            BluetoothStatsLog.BLUETOOTH_CROSS_LAYER_EVENT_REPORTED__STATE__START,

                            source.getUid());



            try {

                return service.connectAllEnabledProfiles(device);