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

Commit 97bd3195 authored by Palash Ahuja's avatar Palash Ahuja Committed by Automerger Merge Worker
Browse files

Merge "BluetoothMetrics: Uploading metric Id with Bond State Change event"... 

Merge "BluetoothMetrics: Uploading metric Id with Bond State Change event" into tm-qpr-dev am: 3d925991 am: 4cee70ca

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



Change-Id: I062327c664d19a836c5e156416d9901380380f7c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 6d4bf4c2 4cee70ca

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

+2 −2
Original line number Diff line number Diff line
@@ -351,7 +351,7 @@ final class BondStateMachine extends StateMachine { 
                      mAdapterService.obfuscateAddress(dev), transport, dev.getType(),

                      BluetoothDevice.BOND_BONDING,

                      BluetoothProtoEnums.BOND_SUB_STATE_LOCAL_START_PAIRING_OOB,

                      BluetoothProtoEnums.UNBOND_REASON_UNKNOWN);

                      BluetoothProtoEnums.UNBOND_REASON_UNKNOWN, mAdapterService.getMetricId(dev));

                result = mAdapterService.createBondOutOfBandNative(addr, transport,

                    remoteP192Data, remoteP256Data);

            } else {
@@ -359,7 +359,7 @@ final class BondStateMachine extends StateMachine { 
                      mAdapterService.obfuscateAddress(dev), transport, dev.getType(),

                      BluetoothDevice.BOND_BONDING,

                      BluetoothProtoEnums.BOND_SUB_STATE_LOCAL_START_PAIRING,

                      BluetoothProtoEnums.UNBOND_REASON_UNKNOWN);

                      BluetoothProtoEnums.UNBOND_REASON_UNKNOWN, mAdapterService.getMetricId(dev));

                result = mAdapterService.createBondNative(addr, transport);

            }

            BluetoothStatsLog.write(BluetoothStatsLog.BLUETOOTH_DEVICE_NAME_REPORTED,