Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove dogfooder opt-out via platformcompat" into sc-qpr1-dev am: 068f82dd52 am: 74d26d341d

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15879517

Change-Id: I84fe5d9caccca2c2bb71b79e2d367b16dcd1b265
This commit is contained in:
Bernardo Rufino
2021-09-23 09:44:25 +00:00
committed by Automerger Merge Worker
parent a8d17002ba 74d26d341d
commit d5221c8319
1 changed files with 0 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/core/java/com/android/server/wm/WindowState.java
View File

@@ -26,7 +26,6 @@ import static android.app.WindowConfiguration.isSplitScreenWindowingMode;
import static android.content.res.Configuration.ORIENTATION_LANDSCAPE; import static android.content.res.Configuration.ORIENTATION_LANDSCAPE;
import static android.graphics.GraphicsProtos.dumpPointProto; import static android.graphics.GraphicsProtos.dumpPointProto;
import static android.hardware.display.DisplayManager.SWITCHING_TYPE_NONE; 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.InputConstants.DEFAULT_DISPATCHING_TIMEOUT_MILLIS;
import static android.os.PowerManager.DRAW_WAKE_LOCK; import static android.os.PowerManager.DRAW_WAKE_LOCK;
import static android.os.Trace.TRACE_TAG_WINDOW_MANAGER; import static android.os.Trace.TRACE_TAG_WINDOW_MANAGER;
@@ -196,7 +195,6 @@ import android.annotation.Nullable;
import android.app.ActivityTaskManager; import android.app.ActivityTaskManager;
import android.app.AppOpsManager; import android.app.AppOpsManager;
import android.app.admin.DevicePolicyCache; import android.app.admin.DevicePolicyCache;
import android.app.compat.CompatChanges;
import android.content.Context; import android.content.Context;
import android.content.res.Configuration; import android.content.res.Configuration;
import android.graphics.Matrix; import android.graphics.Matrix;
@@ -1172,9 +1170,6 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP
} }
int getTouchOcclusionMode() { int getTouchOcclusionMode() {
if (!CompatChanges.isChangeEnabled(BLOCK_UNTRUSTED_TOUCHES, mOwnerUid)) {
return TouchOcclusionMode.ALLOW;
}
if (WindowManager.LayoutParams.isSystemAlertWindowType(mAttrs.type)) { if (WindowManager.LayoutParams.isSystemAlertWindowType(mAttrs.type)) {
return TouchOcclusionMode.USE_OPACITY; return TouchOcclusionMode.USE_OPACITY;
} }