diff options
| author | 2024-05-10 13:41:35 -0700 | |
|---|---|---|
| committer | 2024-05-14 08:31:17 -0700 | |
| commit | cfbee5304f8fa7210e6f0816ca2ef2b6ab22c689 (patch) | |
| tree | 95e36c55a539de10ccef28a5d5c66357990c7ab9 /include/input/Input.h | |
| parent | 278e699ba51bb8c2bcde28f9d83565d7bf85d6a5 (diff) | |
Move ADISPLAY_ID_ definitions into LogicalDisplayId
These will eventually replace the existing definitions as follows:
ADISPLAY_ID_NONE -->> LogicalDisplayId::INVALID
ADISPLAY_ID_DEFAULT -->> LogicalDisplayId::DEFAULT
We are keeping the old definitions for now, to reduce the merge
conflicts. These will be removed in subsequent CLs, after the
frameworks/base and other repository patches go in.
The constant "NONE" was renamed to "INVALID" to make it consistent with
the Java definitions.
Bug: 339106983
Test: m checkinput
Change-Id: I0274be345159c85cb51fcea743d8acd3d298cd07
Diffstat (limited to 'include/input/Input.h')
| -rw-r--r-- | include/input/Input.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/input/Input.h b/include/input/Input.h index e939145bbf..3ca9c19876 100644 --- a/include/input/Input.h +++ b/include/input/Input.h @@ -553,7 +553,7 @@ protected: int32_t mId; DeviceId mDeviceId; uint32_t mSource; - ui::LogicalDisplayId mDisplayId{ui::ADISPLAY_ID_NONE}; + ui::LogicalDisplayId mDisplayId{ui::LogicalDisplayId::INVALID}; std::array<uint8_t, 32> mHmac; }; |