Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ec345dad authored by Darryl Johnson's avatar Darryl Johnson
Browse files

Revert "Block untrusted touches in enforcing mode" 

This reverts commit d86481e6.

Reason for revert: Possible cause of b/175877133

Change-Id: Iedbb835c6daeb95b337f0db699160c5ce037013e
parent d86481e6

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -193,7 +193,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.BLOCK;

            BlockUntrustedTouchesMode.PERMISSIVE;





    /**

    /**

     * 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

services/core/java/com/android/server/input/InputManagerService.java

+1 −5
Original line number Original line Diff line number Diff line
@@ -158,9 +158,6 @@ 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;
@@ -2202,8 +2199,7 @@ 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 (!UNTRUSTED_TOUCHES_TOAST || ArrayUtils.contains(

        if (ArrayUtils.contains(PACKAGE_BLOCKLIST_FOR_UNTRUSTED_TOUCHES_TOAST, packageName)) {

                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;

        }

        }