commit 441818dea03b28e6287becf4970d197421c4f3f9
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Wed Mar 13 03:59:36 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Mar 13 03:59:36 2024 +0000
tree 1d7334660ef0a9cc6f07bef1a82e590c41f85d65
parent 25a229b8205be7fffea4a5badecec9e028fe2a07
parent 708fb4f7a186460fde2cd4eef0bc5639fdfcaba7

Merge "Use input token in PointerCaptureRequest" into main

services/core/jni/com_android_server_input_InputManagerService.cpp

diff --git a/services/core/jni/com_android_server_input_InputManagerService.cpp b/services/core/jni/com_android_server_input_InputManagerService.cpp
index c778398..610fcb5 100644
--- a/services/core/jni/com_android_server_input_InputManagerService.cpp
+++ b/services/core/jni/com_android_server_input_InputManagerService.cpp
@@ -502,7 +502,7 @@
                 toString(mLocked.pointerGesturesEnabled));
         dump += StringPrintf(INDENT "Show Touches: %s\n", toString(mLocked.showTouches));
         dump += StringPrintf(INDENT "Pointer Capture: %s, seq=%" PRIu32 "\n",
-                             mLocked.pointerCaptureRequest.enable ? "Enabled" : "Disabled",
+                             mLocked.pointerCaptureRequest.isEnable() ? "Enabled" : "Disabled",
                              mLocked.pointerCaptureRequest.seq);
         if (auto pc = mLocked.legacyPointerController.lock(); pc) {
             dump += pc->dump();
@@ -1717,7 +1717,7 @@
             return;
         }
 
-        ALOGV("%s pointer capture.", request.enable ? "Enabling" : "Disabling");
+        ALOGV("%s pointer capture.", request.isEnable() ? "Enabling" : "Disabling");
         mLocked.pointerCaptureRequest = request;
     } // release lock