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

Commit 04286383 authored by Mason Wang's avatar Mason Wang
Browse files

Revert "ENABLE_TOUCH_OPAQUE_ACTIVITIES to default enabled" 

Revert "Update WindowUntrustedTouchTest"

Revert submission 16532816-activity-touch-opaque-on

Reason for revert: This commit caused build break, please refer to b/215427711
Reverted Changes:
I7b709ebfd:ENABLE_TOUCH_OPAQUE_ACTIVITIES to default enabled
I889014b4d:Update WindowUntrustedTouchTest

Change-Id: Ia957c42c73886db06d62e7c0fcb3feae9638a5ea
parent ab96d4bb

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

+4 −3
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ import static com.android.server.wm.WindowContainer.AnimationFlags.TRANSITION; 


import android.app.compat.CompatChanges;

import android.compat.annotation.ChangeId;

import android.compat.annotation.Overridable;

import android.compat.annotation.Disabled;

import android.os.IBinder;

import android.os.InputConstants;

import android.os.Looper;
@@ -47,7 +47,7 @@ class ActivityRecordInputSink { 
     * Feature flag for making Activities consume all touches within their task bounds.

     */

    @ChangeId

    @Overridable

    @Disabled

    static final long ENABLE_TOUCH_OPAQUE_ACTIVITIES = 194480991L;



    private static final String TAG = "ActivityRecordInputSink";
@@ -116,7 +116,8 @@ class ActivityRecordInputSink { 
    private InputWindowHandle createInputWindowHandle() {

        InputWindowHandle inputWindowHandle = new InputWindowHandle(null,

                mActivityRecord.getDisplayId());

        inputWindowHandle.replaceTouchableRegionWithCrop(mActivityRecord.getSurfaceControl());

        inputWindowHandle.replaceTouchableRegionWithCrop(

                mActivityRecord.getParentSurfaceControl());

        inputWindowHandle.name = mName;

        inputWindowHandle.ownerUid = Process.myUid();

        inputWindowHandle.ownerPid = Process.myPid();