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

Commit b0da2c59 authored by Chris Manton's avatar Chris Manton Committed by Roopa Sattiraju
Browse files

Adding telemetry for SDP UUID metric choke points 

Bug: 260754694
Test: Test during pairing and check for fetch and happy path with statsd_write/WW IDE
Tag: #refactor
Change-Id: I14923139a5ce9a371fd07a8cfc15bb74bb0b19f0
parent e521894d

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

+3 −0
Original line number Diff line number Diff line
@@ -3077,7 +3077,10 @@ public class AdapterService extends Service { 
        public void fetchRemoteUuids(BluetoothDevice device, int transport,

                AttributionSource source, SynchronousResultReceiver receiver) {

            try {

                // SDP Initiated SDP fetch UUID request

                receiver.send(fetchRemoteUuids(device, transport, source));

                MetricsLogger.getInstance().cacheCount(

                        BluetoothProtoEnums.SDP_FETCH_UUID_REQUEST, 1);

            } catch (RuntimeException e) {

                receiver.propagateException(e);

            }

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

+33 −1
Original line number Diff line number Diff line
@@ -115,8 +115,15 @@ final class RemoteDevices { 
                case MESSAGE_UUID_INTENT:

                    BluetoothDevice device = (BluetoothDevice) msg.obj;

                    if (device != null) {

                        // SDP Sending delayed SDP UUID intent

                        MetricsLogger.getInstance().cacheCount(

                                BluetoothProtoEnums.SDP_SENDING_DELAYED_UUID, 1);

                        DeviceProperties prop = getDeviceProperties(device);

                        sendUuidIntent(device, prop);

                    } else {

                        // SDP Not sending delayed SDP UUID intent b/c device is not there

                        MetricsLogger.getInstance().cacheCount(

                                BluetoothProtoEnums.SDP_NOT_SENDING_DELAYED_UUID, 1);

                    }

                    break;

            }
@@ -695,6 +702,9 @@ final class RemoteDevices { 
        Utils.sendBroadcast(mAdapterService, intent, BLUETOOTH_CONNECT,

                Utils.getTempAllowlistBroadcastOptions());



        // SDP Sent UUID Intent here

        MetricsLogger.getInstance().cacheCount(

                BluetoothProtoEnums.SDP_SENT_UUID, 1);

        //Remove the outstanding UUID request

        mSdpTracker.remove(device);

    }
@@ -898,16 +908,29 @@ final class RemoteDevices { 
                        case AbstractionLayer.BT_PROPERTY_UUIDS:

                            final ParcelUuid[] newUuids = Utils.byteArrayToUuid(val);

                            if (areUuidsEqual(newUuids, deviceProperties.getUuids())) {

                                debugLog( "Skip uuids update for " + bdDevice);

                                // SDP Skip adding UUIDs to property cache if equal

                                debugLog("Skip uuids update for " + bdDevice.getAddress());

                                MetricsLogger.getInstance().cacheCount(

                                        BluetoothProtoEnums.SDP_UUIDS_EQUAL_SKIP, 1);

                                break;

                            }

                            deviceProperties.setUuids(newUuids);

                            if (mAdapterService.getState() == BluetoothAdapter.STATE_ON) {

                                // SDP Adding UUIDs to property cache and sending intent

                                MetricsLogger.getInstance().cacheCount(

                                        BluetoothProtoEnums.SDP_ADD_UUID_WITH_INTENT, 1);

                                mAdapterService.deviceUuidUpdated(bdDevice);

                                sendUuidIntent(bdDevice, deviceProperties);

                            } else if (mAdapterService.getState()

                                    == BluetoothAdapter.STATE_BLE_ON) {

                                // SDP Adding UUIDs to property cache but with no intent

                                MetricsLogger.getInstance().cacheCount(

                                        BluetoothProtoEnums.SDP_ADD_UUID_WITH_NO_INTENT, 1);

                                mAdapterService.deviceUuidUpdated(bdDevice);

                            } else {

                                // SDP Silently dropping UUIDs and with no intent

                                MetricsLogger.getInstance().cacheCount(

                                        BluetoothProtoEnums.SDP_DROP_UUID, 1);

                            }

                            break;

                        case AbstractionLayer.BT_PROPERTY_TYPE_OF_DEVICE:
@@ -1180,6 +1203,9 @@ final class RemoteDevices { 


    void fetchUuids(BluetoothDevice device, int transport) {

        if (mSdpTracker.contains(device)) {

            // SDP Skip fetch UUIDs if cached

            MetricsLogger.getInstance().cacheCount(

                    BluetoothProtoEnums.SDP_FETCH_UUID_SKIP_ALREADY_CACHED, 1);

            return;

        }
@@ -1187,6 +1213,9 @@ final class RemoteDevices { 
        DeviceProperties deviceProperties = getDeviceProperties(device);

        if (deviceProperties != null && deviceProperties.isBonding()

                && getDeviceProperties(device).getUuids() == null) {

            // SDP Skip fetch UUIDs due to bonding

            MetricsLogger.getInstance().cacheCount(

                    BluetoothProtoEnums.SDP_FETCH_UUID_SKIP_ALREADY_BONDED, 1);

            return;

        }
@@ -1198,8 +1227,11 @@ final class RemoteDevices { 


        // Uses cached UUIDs if we are bonding. If not, we fetch the UUIDs with SDP.

        if (deviceProperties == null || !deviceProperties.isBonding()) {

            // SDP Invoked native code to spin up SDP cycle

            mAdapterService.getRemoteServicesNative(Utils.getBytesFromAddress(device.getAddress()),

                    transport);

            MetricsLogger.getInstance().cacheCount(

                    BluetoothProtoEnums.SDP_INVOKE_SDP_CYCLE, 1);

        }

    }