Merge "Mark RotationLayer as trusted for untrusted touches"
diff --git a/services/core/java/com/android/server/wm/ScreenRotationAnimation.java b/services/core/java/com/android/server/wm/ScreenRotationAnimation.java
index 1a27b1b..533c82e 100644
--- a/services/core/java/com/android/server/wm/ScreenRotationAnimation.java
+++ b/services/core/java/com/android/server/wm/ScreenRotationAnimation.java
@@ -206,12 +206,17 @@
.setCallsite("ScreenRotationAnimation")
.build();
+ String name = "RotationLayer";
mScreenshotLayer = displayContent.makeOverlay()
- .setName("RotationLayer")
+ .setName(name)
.setBufferSize(mWidth, mHeight)
.setSecure(isSecure)
.setCallsite("ScreenRotationAnimation")
.build();
+ // This is the way to tell the input system to exclude this surface from occlusion
+ // detection since we don't have a window for it. We do this because this window is
+ // generated by the system as well as its content.
+ InputMonitor.setTrustedOverlayInputInfo(mScreenshotLayer, t, displayId, name);
mEnterBlackFrameLayer = displayContent.makeOverlay()
.setName("EnterBlackFrameLayer")