Merge "Flag cleanup: enable_input_filter_rust_impl" into main (c5d886b6) · Commits · e / os / android_frameworks_base

core/java/android/hardware/input/InputSettings.java

+3 −4

Original line number	Diff line number	Diff line
		@@ -35,7 +35,6 @@ import static com.android.hardware.input.Flags.touchpadVisualizer;
		import static com.android.hardware.input.Flags.useKeyGestureEventHandler;
		import static com.android.hardware.input.Flags.useKeyGestureEventHandlerMultiKeyGestures;
		import static com.android.input.flags.Flags.FLAG_KEYBOARD_REPEAT_KEYS;
		import static com.android.input.flags.Flags.enableInputFilterRustImpl;
		import static com.android.input.flags.Flags.keyboardRepeatKeys;

		import android.Manifest;
		@@ -883,7 +882,7 @@ public class InputSettings {
		* @hide
		*/
		public static boolean isAccessibilityBounceKeysFeatureEnabled() {
		return keyboardA11yBounceKeysFlag() && enableInputFilterRustImpl();
		return keyboardA11yBounceKeysFlag();
		}

		/**
		@@ -967,7 +966,7 @@ public class InputSettings {
		* @hide
		*/
		public static boolean isAccessibilitySlowKeysFeatureFlagEnabled() {
		return keyboardA11ySlowKeysFlag() && enableInputFilterRustImpl();
		return keyboardA11ySlowKeysFlag();
		}

		/**
		@@ -1053,7 +1052,7 @@ public class InputSettings {
		* @hide
		*/
		public static boolean isAccessibilityStickyKeysFeatureEnabled() {
		return keyboardA11yStickyKeysFlag() && enableInputFilterRustImpl();
		return keyboardA11yStickyKeysFlag();
		}

		/**

services/core/jni/com_android_server_input_InputManagerService.cpp

+5 −13

Original line number	Diff line number	Diff line
		@@ -94,8 +94,6 @@ namespace input_flags = com::android::input::flags;

		namespace android {

		static const bool ENABLE_INPUT_FILTER_RUST = input_flags::enable_input_filter_rust_impl();

		// The exponent used to calculate the pointer speed scaling factor.
		// The scaling factor is calculated as 2 ^ (speed * exponent),
		// where the speed ranges from -7 to + 7 and is supplied by the user.
		@@ -3248,28 +3246,22 @@ static void nativeSetStylusPointerIconEnabled(JNIEnv* env, jobject nativeImplObj
		static void nativeSetAccessibilityBounceKeysThreshold(JNIEnv* env, jobject nativeImplObj,
		jint thresholdTimeMs) {
		NativeInputManager* im = getNativeInputManager(env, nativeImplObj);
		if (ENABLE_INPUT_FILTER_RUST) {
		im->getInputManager()->getInputFilter().setAccessibilityBounceKeysThreshold(
		static_cast<nsecs_t>(thresholdTimeMs) * 1000000);
		}
		}

		static void nativeSetAccessibilitySlowKeysThreshold(JNIEnv* env, jobject nativeImplObj,
		jint thresholdTimeMs) {
		NativeInputManager* im = getNativeInputManager(env, nativeImplObj);
		if (ENABLE_INPUT_FILTER_RUST) {
		im->getInputManager()->getInputFilter().setAccessibilitySlowKeysThreshold(
		static_cast<nsecs_t>(thresholdTimeMs) * 1000000);
		}
		}

		static void nativeSetAccessibilityStickyKeysEnabled(JNIEnv* env, jobject nativeImplObj,
		jboolean enabled) {
		NativeInputManager* im = getNativeInputManager(env, nativeImplObj);
		if (ENABLE_INPUT_FILTER_RUST) {
		im->getInputManager()->getInputFilter().setAccessibilityStickyKeysEnabled(enabled);
		}
		}

		static void nativeSetInputMethodConnectionIsActive(JNIEnv* env, jobject nativeImplObj,
		jboolean isActive) {

tests/Input/src/android/hardware/input/StickyModifierStateListenerTest.kt

+1 −4

Original line number	Diff line number	Diff line
		@@ -50,10 +50,7 @@ import org.mockito.junit.MockitoJUnitRunner
		*/
		@Presubmit
		@RunWith(MockitoJUnitRunner::class)
		@EnableFlags(
		com.android.hardware.input.Flags.FLAG_KEYBOARD_A11Y_STICKY_KEYS_FLAG,
		com.android.input.flags.Flags.FLAG_ENABLE_INPUT_FILTER_RUST_IMPL,
		)
		@EnableFlags(com.android.hardware.input.Flags.FLAG_KEYBOARD_A11Y_STICKY_KEYS_FLAG)
		class StickyModifierStateListenerTest {

		@get:Rule