Merge "Revert "Block untrusted touches in enforcing mode"" (05d89990) · Commits · e / os / android_frameworks_base

core/java/android/hardware/input/InputManager.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -195,7 +195,7 @@ public final class InputManager {
		*/
		@BlockUntrustedTouchesMode
		public static final int DEFAULT_BLOCK_UNTRUSTED_TOUCHES_MODE =
		BlockUntrustedTouchesMode.BLOCK;
		BlockUntrustedTouchesMode.PERMISSIVE;

		/**
		* Prevent touches from being consumed by apps if these touches passed through a non-trusted

+1 −5

Original line number	Diff line number	Diff line
		@@ -161,9 +161,6 @@ public class InputManagerService extends IInputManager.Stub
		"com.snapchat.android" // b/173297887
		};

		/** TODO(b/169067926): Remove this. */
		private static final boolean UNTRUSTED_TOUCHES_TOAST = false;

		// Pointer to native input manager service object.
		private final long mPtr;

		@@ -2310,8 +2307,7 @@ public class InputManagerService extends IInputManager.Stub
		// Native callback
		private void notifyUntrustedTouch(String packageName) {
		// TODO(b/169067926): Remove toast after gathering feedback on dogfood.
		if (!UNTRUSTED_TOUCHES_TOAST \|\| ArrayUtils.contains(
		PACKAGE_BLOCKLIST_FOR_UNTRUSTED_TOUCHES_TOAST, packageName)) {
		if (ArrayUtils.contains(PACKAGE_BLOCKLIST_FOR_UNTRUSTED_TOUCHES_TOAST, packageName)) {
		Log.i(TAG, "Suppressing untrusted touch toast for " + packageName);
		return;
		}