summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Linus Tufvesson <lus@google.com> 2023-03-01 18:58:39 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-03-01 18:58:39 +0000
commitcbcfab9bbe005a02104fe8d53e5bf02f35e7c0d4 (patch)
treedb2f7859d8a50484dcf243138d2ce9dd3c92c1d1
parent53a66d769aa15b6e81f803922110258d967587ff (diff)
parent73ee4cb9c4f108c2edf68443c339bc64a9240322 (diff)
Make Activites touch opaque - DO NOT MERGE am: 73ee4cb9c4
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21611410 Change-Id: I0de6127f9e8dfc5efbee58a53f9eb5170fc69eef Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--services/core/java/com/android/server/wm/ActivityRecordInputSink.java4
1 files changed, 4 insertions, 0 deletions
diff --git a/services/core/java/com/android/server/wm/ActivityRecordInputSink.java b/services/core/java/com/android/server/wm/ActivityRecordInputSink.java
index 95b5cec9a144..95a6e8b8b88f 100644
--- a/services/core/java/com/android/server/wm/ActivityRecordInputSink.java
+++ b/services/core/java/com/android/server/wm/ActivityRecordInputSink.java
@@ -86,6 +86,10 @@ class ActivityRecordInputSink {
mInputWindowHandle.layoutParamsFlags &= ~WindowManager.LayoutParams.FLAG_NOT_TOUCHABLE;
changed |= notTouchable;
}
+ if (mInputWindowHandle.displayId != mActivityRecord.getDisplayId()) {
+ mInputWindowHandle.displayId = mActivityRecord.getDisplayId();
+ changed = true;
+ }
return changed;
}