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

Commit d5221c83 authored by Bernardo Rufino's avatar Bernardo Rufino Committed by Automerger Merge Worker
Browse files

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

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

Change-Id: I84fe5d9caccca2c2bb71b79e2d367b16dcd1b265
parents a8d17002 74d26d34

services/core/java/com/android/server/wm/WindowState.java

+0 −5
Original line number Diff line number Diff line
@@ -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;
@@ -196,7 +195,6 @@ import android.annotation.Nullable; 
import android.app.ActivityTaskManager;

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;
@@ -1172,9 +1170,6 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP 
    }



    int getTouchOcclusionMode() {

        if (!CompatChanges.isChangeEnabled(BLOCK_UNTRUSTED_TOUCHES, mOwnerUid)) {

            return TouchOcclusionMode.ALLOW;

        }

        if (WindowManager.LayoutParams.isSystemAlertWindowType(mAttrs.type)) {

            return TouchOcclusionMode.USE_OPACITY;

        }