diff options
| author | Asmita Poddar <asmitapoddar@google.com> | 2024-02-26 11:13:38 +0000 |
|---|---|---|
| committer | Vaibhav Devmurari <vdevmurari@google.com> | 2024-02-26 11:23:39 +0000 |
| commit | 28459c1acde9a33a68e682bf20903fa8c1cfacbc (patch) | |
| tree | 62ea53345b70207b78a5c842e2e2c5359b096c24 | |
| parent | fb16bb6356fec7f6a031fc8d04c1ee913fc8c548 (diff) | |
| download | proto_logging-28459c1acde9a33a68e682bf20903fa8c1cfacbc.tar.gz | |
Add device bus to keyboard atoms
Since the same vendor ID could mean different vendors depending on
whether the device is connected over bluetooth or USB, we require to know
the device bus to disambiguate the vendor IDs.
Bug: 308918242
Test: Pre-submit
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:5e71f0a35c4a9f15dc11d981f52e819fb622675e)
Merged-In: I353047949456529d3fef03ab0eb394e8a8439603
Change-Id: I353047949456529d3fef03ab0eb394e8a8439603
NOTE FOR REVIEWERS - errors occurred while applying the patch.
PLEASE REVIEW CAREFULLY.
Errors:
Error applying patch in stats/atoms/input/input_extension_atoms.proto, hunk HunkHeader[97,6->99,8]: Hunk cannot be applied
Original patch:
From 5e71f0a35c4a9f15dc11d981f52e819fb622675e Mon Sep 17 00:00:00 2001
From: Asmita Poddar <asmitapoddar@google.com>
Date: Mon, 27 Nov 2023 17:03:20 +0000
Subject: [PATCH] Add device bus to keyboard atoms
Since the same vendor ID could mean different vendors depending on
whether the device is connected over bluetooth or USB, we require to know
the device bus to disambiguate the vendor IDs.
Bug: 308918242
Test: Pre-submit
Change-Id: I353047949456529d3fef03ab0eb394e8a8439603
---
| -rw-r--r-- | stats/atoms/input/input_extension_atoms.proto | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/stats/atoms/input/input_extension_atoms.proto b/stats/atoms/input/input_extension_atoms.proto index 123eedbc..e3d264e1 100644 --- a/stats/atoms/input/input_extension_atoms.proto +++ b/stats/atoms/input/input_extension_atoms.proto @@ -74,6 +74,8 @@ message KeyboardConfigured { optional int32 product_id = 3; // Keyboard configuration details optional RepeatedKeyboardLayoutConfig repeated_keyboard_layout_config = 4 [(log_mode) = MODE_BYTES]; + // The Input Device Bus ID + optional android.input.InputDeviceBus device_bus = 5; } /** @@ -94,8 +96,10 @@ message KeyboardSystemsEventReported { optional android.input.KeyboardSystemEvent keyboard_system_event = 3; // Key pressed to trigger the keyboard event repeated int32 key_code = 4; - // Flag based modifier state when keyboard event was triggered + // This field represents the decimal version of the flag in binary optional int32 modifier_state = 5; + // The Input Device Bus ID + optional android.input.InputDeviceBus device_bus = 6; } /** |