From cfbee5304f8fa7210e6f0816ca2ef2b6ab22c689 Mon Sep 17 00:00:00 2001
From: Siarhei Vishniakou <svv@google.com>
Date: Fri, 10 May 2024 13:41:35 -0700
Subject: 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
---
 include/input/InputDevice.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'include/input/InputDevice.h')

diff --git a/include/input/InputDevice.h b/include/input/InputDevice.h
index 8783d9c192..7d8c19e702 100644
--- a/include/input/InputDevice.h
+++ b/include/input/InputDevice.h
@@ -366,7 +366,7 @@ private:
     int32_t mKeyboardType;
     std::shared_ptr<KeyCharacterMap> mKeyCharacterMap;
     std::optional<InputDeviceUsiVersion> mUsiVersion;
-    ui::LogicalDisplayId mAssociatedDisplayId{ui::ADISPLAY_ID_NONE};
+    ui::LogicalDisplayId mAssociatedDisplayId{ui::LogicalDisplayId::INVALID};
     bool mEnabled;
 
     bool mHasVibrator;
-- 
cgit v1.2.3-59-g8ed1b