diff options
| author | 2019-04-04 00:01:16 +0000 | |
|---|---|---|
| committer | 2019-04-04 00:01:16 +0000 | |
| commit | 412e35af24f14e7bb56d7935a8adc082633c8bb3 (patch) | |
| tree | eb568337165799c8a854c20dbd83ca87900d41cf | |
| parent | 96ec115e1a8d505321f5b20fbe51c35064a294e2 (diff) | |
| parent | ac33c99889a4224c00cb455ec82f8547f78d7440 (diff) | |
Merge "Atom: Keep obfuscated_id name in BluetoothConnectionStateChanged"
| -rw-r--r-- | cmds/statsd/src/atoms.proto | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cmds/statsd/src/atoms.proto b/cmds/statsd/src/atoms.proto index dc4413f5457c..cbb78bf5732c 100644 --- a/cmds/statsd/src/atoms.proto +++ b/cmds/statsd/src/atoms.proto @@ -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]; } /** |