Merge "[Attempt #2] Block untrusted touches in enforcing mode" (09b2ae99) · Commits · e / os / android_frameworks_base

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

+1 −1

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

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

+5 −1

Original line number	Original line	Diff line number	Diff line
	@@ -161,6 +161,9 @@ public class InputManagerService extends IInputManager.Stub
	"com.snapchat.android" // b/173297887		"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.		// Pointer to native input manager service object.
	private final long mPtr;		private final long mPtr;

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