diff --git a/core/java/android/hardware/input/InputManager.java b/core/java/android/hardware/input/InputManager.java index 300d99bbd6895..9d20f6d72d03a 100644 --- a/core/java/android/hardware/input/InputManager.java +++ b/core/java/android/hardware/input/InputManager.java @@ -195,7 +195,7 @@ public final class InputManager { */ @BlockUntrustedTouchesMode 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 diff --git a/services/core/java/com/android/server/input/InputManagerService.java b/services/core/java/com/android/server/input/InputManagerService.java index bff81e66ced30..71fcd1de3b8fc 100644 --- a/services/core/java/com/android/server/input/InputManagerService.java +++ b/services/core/java/com/android/server/input/InputManagerService.java @@ -161,6 +161,9 @@ 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; @@ -2307,7 +2310,8 @@ public class InputManagerService extends IInputManager.Stub // Native callback private void notifyUntrustedTouch(String packageName) { // 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); return; }