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

Commit 3d925991 authored by Palash Ahuja's avatar Palash Ahuja Committed by Android (Google) Code Review
Browse files

Merge "BluetoothMetrics: Uploading metric Id with Bond State Change event" into tm-qpr-dev

parents 9ca4ba67 59fbdd1b

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

+2 −2
Original line number Diff line number Diff line
@@ -346,7 +346,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 {
@@ -354,7 +354,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,