summaryrefslogtreecommitdiff
path: root/libs/input/InputFlags.cpp
diff options
context:
space:
mode:
author Arpit Singh <arpitks@google.com> 2025-03-06 13:47:19 +0000
committer Arpit Singh <arpitks@google.com> 2025-03-10 11:12:20 +0000
commit68ef9a17a1894ed5590172dba159df4a08b23fa0 (patch)
tree02e0775dd4a0bdc307c64a4a5328403ff16d3317 /libs/input/InputFlags.cpp
parentc93479c9bfffac40445b6b0a843519690f73d028 (diff)
Add dev option override flag to connected display cursor flag
Adding the dev option flag that guards the dev option UI before checking the override value. We will fall back to connected displays cursor flag if dev option override is not available. Test: manual and presubmit Bug: 401213103 Flag: EXEMPT only changes the flagging logic Change-Id: Ib9fb9a66deaf1d58b36218039d1854e287be7ce5
Diffstat (limited to 'libs/input/InputFlags.cpp')
-rw-r--r--libs/input/InputFlags.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/libs/input/InputFlags.cpp b/libs/input/InputFlags.cpp
index f866f9b8f0..6aa9ae6b16 100644
--- a/libs/input/InputFlags.cpp
+++ b/libs/input/InputFlags.cpp
@@ -18,6 +18,7 @@
#include <android-base/logging.h>
#include <com_android_input_flags.h>
+#include <com_android_window_flags.h>
#include <cutils/properties.h>
#include <string>
@@ -25,6 +26,9 @@
namespace android {
bool InputFlags::connectedDisplaysCursorEnabled() {
+ if (!com::android::window::flags::enable_desktop_mode_through_dev_option()) {
+ return com::android::input::flags::connected_displays_cursor();
+ }
static std::optional<bool> cachedDevOption;
if (!cachedDevOption.has_value()) {
char value[PROPERTY_VALUE_MAX];