Merge "[CD Cursor] Devopts override for connected displays flag" into main (93816371) · Commits · e / os / android_frameworks_native

include/input/InputFlags.h

0 → 100644

+30 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright 2025 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		#pragma once

		namespace android {

		class InputFlags {
		public:
		/**
		* Check if connected displays feature is enabled, either via the feature flag or settings
		* override.
		*/
		static bool connectedDisplaysCursorEnabled();
		};

		} // namespace android

libs/input/Android.bp

+1 −0

Original line number	Diff line number	Diff line
		@@ -230,6 +230,7 @@ cc_library {
		"InputConsumerNoResampling.cpp",
		"InputDevice.cpp",
		"InputEventLabels.cpp",
		"InputFlags.cpp",
		"InputTransport.cpp",
		"InputVerifier.cpp",
		"KeyCharacterMap.cpp",

libs/input/InputFlags.cpp

0 → 100644

+42 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright 2025 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		#include <input/InputFlags.h>

		#include <android-base/logging.h>
		#include <com_android_input_flags.h>
		#include <cutils/properties.h>

		#include <string>

		namespace android {

		bool InputFlags::connectedDisplaysCursorEnabled() {
		static std::optional<bool> cachedDevOption;
		if (!cachedDevOption.has_value()) {
		char value[PROPERTY_VALUE_MAX];
		constexpr static auto sysprop_name = "persist.wm.debug.desktop_experience_devopts";
		const int devOptionEnabled =
		property_get(sysprop_name, value, nullptr) > 0 ? std::atoi(value) : 0;
		cachedDevOption = devOptionEnabled == 1;
		}
		if (cachedDevOption.value_or(false)) {
		return true;
		}
		return com::android::input::flags::connected_displays_cursor();
		}

		} // namespace android
		No newline at end of file

services/inputflinger/PointerChoreographer.cpp

+2 −1

Original line number	Diff line number	Diff line
		@@ -23,6 +23,7 @@
		#if defined(__ANDROID__)
		#include <gui/SurfaceComposerClient.h>
		#endif
		#include <input/InputFlags.h>
		#include <input/Keyboard.h>
		#include <input/PrintTools.h>
		#include <unordered_set>
		@@ -328,7 +329,7 @@ void PointerChoreographer::processPointerDeviceMotionEventLocked(NotifyMotionArg
		filterPointerMotionForAccessibilityLocked(pc.getPosition(), vec2{deltaX, deltaY},
		newArgs.displayId);
		vec2 unconsumedDelta = pc.move(filteredDelta.x, filteredDelta.y);
		if (com::android::input::flags::connected_displays_cursor() &&
		if (InputFlags::connectedDisplaysCursorEnabled() &&
		(std::abs(unconsumedDelta.x) > 0 \|\| std::abs(unconsumedDelta.y) > 0)) {
		handleUnconsumedDeltaLocked(pc, unconsumedDelta);
		// pointer may have moved to a different viewport

services/inputflinger/dispatcher/InputDispatcher.cpp

+4 −6

Original line number	Diff line number	Diff line
		@@ -32,6 +32,7 @@
		#include <gui/SurfaceComposerClient.h>
		#endif
		#include <input/InputDevice.h>
		#include <input/InputFlags.h>
		#include <input/PrintTools.h>
		#include <input/TraceTools.h>
		#include <openssl/mem.h>
		@@ -7506,8 +7507,7 @@ void InputDispatcher::DispatcherTouchState::saveTouchStateForMotionEntry(
		return;
		}

		if (com::android::input::flags::connected_displays_cursor() &&
		isMouseOrTouchpad(entry.source)) {
		if (InputFlags::connectedDisplaysCursorEnabled() && isMouseOrTouchpad(entry.source)) {
		mCursorStateByDisplay[windowInfos.getPrimaryDisplayId(entry.displayId)] =
		std::move(touchState);
		} else {
		@@ -7518,8 +7518,7 @@ void InputDispatcher::DispatcherTouchState::saveTouchStateForMotionEntry(
		void InputDispatcher::DispatcherTouchState::eraseTouchStateForMotionEntry(
		const android::inputdispatcher::MotionEntry& entry,
		const DispatcherWindowInfo& windowInfos) {
		if (com::android::input::flags::connected_displays_cursor() &&
		isMouseOrTouchpad(entry.source)) {
		if (InputFlags::connectedDisplaysCursorEnabled() && isMouseOrTouchpad(entry.source)) {
		mCursorStateByDisplay.erase(windowInfos.getPrimaryDisplayId(entry.displayId));
		} else {
		mTouchStatesByDisplay.erase(entry.displayId);
		@@ -7529,8 +7528,7 @@ void InputDispatcher::DispatcherTouchState::eraseTouchStateForMotionEntry(
		const TouchState* InputDispatcher::DispatcherTouchState::getTouchStateForMotionEntry(
		const android::inputdispatcher::MotionEntry& entry,
		const DispatcherWindowInfo& windowInfos) const {
		if (com::android::input::flags::connected_displays_cursor() &&
		isMouseOrTouchpad(entry.source)) {
		if (InputFlags::connectedDisplaysCursorEnabled() && isMouseOrTouchpad(entry.source)) {
		auto touchStateIt =
		mCursorStateByDisplay.find(windowInfos.getPrimaryDisplayId(entry.displayId));
		if (touchStateIt != mCursorStateByDisplay.end()) {