commit cfbee5304f8fa7210e6f0816ca2ef2b6ab22c689
author Siarhei Vishniakou <svv@google.com> Fri May 10 13:41:35 2024 -0700
committer Siarhei Vishniakou <svv@google.com> Tue May 14 08:31:17 2024 -0700
tree 95e36c55a539de10ccef28a5d5c66357990c7ab9
parent 278e699ba51bb8c2bcde28f9d83565d7bf85d6a5

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

services/inputflinger/reader/mapper/TouchpadInputMapper.cpp

diff --git a/services/inputflinger/reader/mapper/TouchpadInputMapper.cpp b/services/inputflinger/reader/mapper/TouchpadInputMapper.cpp
index e157862..2a580c9 100644
--- a/services/inputflinger/reader/mapper/TouchpadInputMapper.cpp
+++ b/services/inputflinger/reader/mapper/TouchpadInputMapper.cpp
@@ -322,7 +322,7 @@
     }
 
     if (!changes.any() || changes.test(InputReaderConfiguration::Change::DISPLAY_INFO)) {
-        mDisplayId = ui::ADISPLAY_ID_NONE;
+        mDisplayId = ui::LogicalDisplayId::INVALID;
         std::optional<DisplayViewport> resolvedViewport;
         std::optional<FloatRect> boundsInLogicalDisplay;
         if (auto assocViewport = mDeviceContext.getAssociatedViewport(); assocViewport) {
@@ -335,7 +335,8 @@
             // Always use DISPLAY_ID_NONE for touchpad events.
             // PointerChoreographer will make it target the correct the displayId later.
             resolvedViewport = getContext()->getPolicy()->getPointerViewportForAssociatedDisplay();
-            mDisplayId = resolvedViewport ? std::make_optional(ui::ADISPLAY_ID_NONE) : std::nullopt;
+            mDisplayId = resolvedViewport ? std::make_optional(ui::LogicalDisplayId::INVALID)
+                                          : std::nullopt;
         }
 
         mGestureConverter.setDisplayId(mDisplayId);