Merge "Atom: Keep obfuscated_id name in BluetoothConnectionStateChanged"

This commit is contained in:
Jack He
2019-04-04 00:01:16 +00:00
committed by Android (Google) Code Review

View File

@@ -1406,7 +1406,7 @@ message BluetoothConnectionStateChanged {
// Currently is last two bytes of a hash of a device level ID and
// the mac address of the bluetooth device that is connected.
// Deprecated: use obfuscated_id instead, this one is always 0 for Q+
optional int32 OBSOLETE_obfuscated_id = 2 [deprecated = true];
optional int32 obfuscated_id = 2 [deprecated = true];
// The profile that is connected. Eg. GATT, A2DP, HEADSET.
// From android.bluetooth.BluetoothAdapter.java
// Default: 0 when not used
@@ -1417,7 +1417,7 @@ message BluetoothConnectionStateChanged {
// Hash algorithm: HMAC-SHA256
// Size: 32 byte
// Default: null or empty if the device identifier is not known
optional bytes obfuscated_id = 4 [(android.os.statsd.log_mode) = MODE_BYTES];
optional bytes new_obfuscated_id = 4 [(android.os.statsd.log_mode) = MODE_BYTES];
}
/**