summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--services/core/java/com/android/server/wm/ActivityRecordInputSink.java7
1 files changed, 3 insertions, 4 deletions
diff --git a/services/core/java/com/android/server/wm/ActivityRecordInputSink.java b/services/core/java/com/android/server/wm/ActivityRecordInputSink.java
index 16813485b988..4b3078ae7c00 100644
--- a/services/core/java/com/android/server/wm/ActivityRecordInputSink.java
+++ b/services/core/java/com/android/server/wm/ActivityRecordInputSink.java
@@ -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.Disabled;
+import android.compat.annotation.Overridable;
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
- @Disabled
+ @Overridable
static final long ENABLE_TOUCH_OPAQUE_ACTIVITIES = 194480991L;
private static final String TAG = "ActivityRecordInputSink";
@@ -116,8 +116,7 @@ class ActivityRecordInputSink {
private InputWindowHandle createInputWindowHandle() {
InputWindowHandle inputWindowHandle = new InputWindowHandle(null,
mActivityRecord.getDisplayId());
- inputWindowHandle.replaceTouchableRegionWithCrop(
- mActivityRecord.getParentSurfaceControl());
+ inputWindowHandle.replaceTouchableRegionWithCrop(mActivityRecord.getSurfaceControl());
inputWindowHandle.name = mName;
inputWindowHandle.ownerUid = Process.myUid();
inputWindowHandle.ownerPid = Process.myPid();