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
diff --git a/include/input/Input.h b/include/input/Input.h
index e939145..3ca9c19 100644
--- a/include/input/Input.h
+++ b/include/input/Input.h
@@ -553,7 +553,7 @@
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;
};