Merge "[Flag Removal] Remove flag... (948a1c44) · Commits · e / os / android_frameworks_base

core/java/android/hardware/input/input_framework.aconfig

+1 −9

Original line number	Diff line number	Diff line
		@@ -210,15 +210,7 @@ flag {
		bug: "416054433"
		}

		flag {
		name: "fix_keyboard_interceptor_policy_call"
		namespace: "input"
		description: "Fixes keyboard interceptor calls to the policy"
		bug: "358569822"
		metadata {
		purpose: PURPOSE_BUGFIX
		}
		}


		flag {
		name: "mouse_to_touch_per_app_compat"

+1 −8

Original line number	Diff line number	Diff line
		@@ -22,7 +22,7 @@ import static android.view.KeyEvent.KEYCODE_UNKNOWN;
		import static android.view.WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_ALWAYS;

		import static com.android.hardware.input.Flags.enableCustomizableInputGestures;
		import static com.android.hardware.input.Flags.fixKeyboardInterceptorPolicyCall;

		import static com.android.hardware.input.Flags.keyEventActivityDetection;
		import static com.android.hardware.input.Flags.touchpadVisualizer;
		import static com.android.server.policy.WindowManagerPolicy.ACTION_PASS_TO_USER;
		@@ -3934,14 +3934,7 @@ public class InputManagerService extends IInputManager.Stub

		@Override
		public long interceptKeyCombinationBeforeAccessibility(@NonNull KeyEvent event) {
		if (fixKeyboardInterceptorPolicyCall()) {
		return mKeyGestureController.interceptKeyCombinationBeforeAccessibility(event);
		} else {
		return mWindowManagerCallbacks.interceptKeyBeforeDispatching(
		/* focusedToken= */null, event)
		? KeyGestureController.KEY_INTERCEPT_RESULT_CONSUMED
		: KeyGestureController.KEY_INTERCEPT_RESULT_NOT_CONSUMED;
		}
		}

		@NonNull