From 16c63ede9ad6c80ae2480fa49e8e408afafe2ea2 Mon Sep 17 00:00:00 2001 From: Bernardo Rufino Date: Wed, 22 Sep 2021 15:10:29 +0100 Subject: [PATCH] Remove dogfooder opt-out via platformcompat We don't need this anymore. Bug: 158002302 Test: atest WindowUntrustedTouchTest Change-Id: I3037f76bf2d3692fcc2bf49c34714a44d1978449 --- services/core/java/com/android/server/wm/WindowState.java | 5 ----- 1 file changed, 5 deletions(-) diff --git a/services/core/java/com/android/server/wm/WindowState.java b/services/core/java/com/android/server/wm/WindowState.java index 5e042efa2f112..0af6a29fad10f 100644 --- a/services/core/java/com/android/server/wm/WindowState.java +++ b/services/core/java/com/android/server/wm/WindowState.java @@ -26,7 +26,6 @@ import static android.app.WindowConfiguration.isSplitScreenWindowingMode; import static android.content.res.Configuration.ORIENTATION_LANDSCAPE; import static android.graphics.GraphicsProtos.dumpPointProto; import static android.hardware.display.DisplayManager.SWITCHING_TYPE_NONE; -import static android.hardware.input.InputManager.BLOCK_UNTRUSTED_TOUCHES; import static android.os.InputConstants.DEFAULT_DISPATCHING_TIMEOUT_MILLIS; import static android.os.PowerManager.DRAW_WAKE_LOCK; import static android.os.Trace.TRACE_TAG_WINDOW_MANAGER; @@ -194,7 +193,6 @@ import android.annotation.NonNull; import android.annotation.Nullable; import android.app.AppOpsManager; import android.app.admin.DevicePolicyCache; -import android.app.compat.CompatChanges; import android.content.Context; import android.content.res.Configuration; import android.graphics.Matrix; @@ -1156,9 +1154,6 @@ class WindowState extends WindowContainer implements WindowManagerP } int getTouchOcclusionMode() { - if (!CompatChanges.isChangeEnabled(BLOCK_UNTRUSTED_TOUCHES, mOwnerUid)) { - return TouchOcclusionMode.ALLOW; - } if (WindowManager.LayoutParams.isSystemAlertWindowType(mAttrs.type)) { return TouchOcclusionMode.USE_OPACITY; }