Merge "Rename BluetoothManufacturerInfoReported to BluetoothDeviceInfoReported" into qt-dev

am: 3553de0d7d

Change-Id: I4ac8c90b9d5536aa0d571983606d5c00ec6f36fe
This commit is contained in:
Jack He
2019-04-04 18:28:29 -07:00
committed by android-build-merger

View File

@@ -234,7 +234,7 @@ message Atom {
BluetoothDeviceTxPowerLevelReported bluetooth_device_tx_power_level_reported = 159; BluetoothDeviceTxPowerLevelReported bluetooth_device_tx_power_level_reported = 159;
BluetoothHciTimeoutReported bluetooth_hci_timeout_reported = 160; BluetoothHciTimeoutReported bluetooth_hci_timeout_reported = 160;
BluetoothQualityReportReported bluetooth_quality_report_reported = 161; BluetoothQualityReportReported bluetooth_quality_report_reported = 161;
BluetoothManufacturerInfoReported bluetooth_device_info_reported = 162; BluetoothDeviceInfoReported bluetooth_device_info_reported = 162;
BluetoothRemoteVersionInfoReported bluetooth_remote_version_info_reported = 163; BluetoothRemoteVersionInfoReported bluetooth_remote_version_info_reported = 163;
BluetoothSdpAttributeReported bluetooth_sdp_attribute_reported = 164; BluetoothSdpAttributeReported bluetooth_sdp_attribute_reported = 164;
BluetoothBondStateChanged bluetooth_bond_state_changed = 165; BluetoothBondStateChanged bluetooth_bond_state_changed = 165;
@@ -1935,7 +1935,7 @@ message BluetoothQualityReportReported {
* Logged from: * Logged from:
* packages/apps/Bluetooth * packages/apps/Bluetooth
*/ */
message BluetoothManufacturerInfoReported { message BluetoothDeviceInfoReported {
// An identifier that can be used to match events for this device. // An identifier that can be used to match events for this device.
// Currently, this is a salted hash of the MAC address of this Bluetooth device. // Currently, this is a salted hash of the MAC address of this Bluetooth device.
// Salt: Randomly generated 256 bit value // Salt: Randomly generated 256 bit value