diff options
| author | 2025-03-10 09:16:33 -0700 | |
|---|---|---|
| committer | 2025-03-10 09:16:33 -0700 | |
| commit | ba48d67cc7adf42efcfb333ae18397f61eb520e5 (patch) | |
| tree | 9858ad17f740b37e1a0c184341f232e0f339af6a /libs/input/InputFlags.cpp | |
| parent | b61e79d3868206e14fcedbd37c54918370702165 (diff) | |
| parent | 68ef9a17a1894ed5590172dba159df4a08b23fa0 (diff) | |
Merge "Add dev option override flag to connected display cursor flag" into main
Diffstat (limited to 'libs/input/InputFlags.cpp')
| -rw-r--r-- | libs/input/InputFlags.cpp | 4 |
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]; |