InputDispatcher: Consider ownerPid in FLAG_OBSCURED calculations
Now that we are receiving an InputWindowHandle for each buffered surface
we need to take care not to introduce any behavior changes:
1. Previously a SurfaceView on top of a main app window
would not obscure that application for Input purposes (since
it was unknown to InputDispatcher). We preserve this semantic
by not considering windows from the same ownerPid as occluding
eachother.
2. However previously, windows WITH input channels from the same process
would generate FLAG_OCCLUDED so we also preserve this semantic by
only implementing the new semantic from 1 when channel is null.
Bug: 152064592
Test: ObscuredInputTests
Change-Id: If45acfd8b63c5ebd68bc219bc0fb6ee1c34650cd
diff --git a/services/inputflinger/dispatcher/InputDispatcher.cpp b/services/inputflinger/dispatcher/InputDispatcher.cpp
index 26b3be6..6fd801e 100644
--- a/services/inputflinger/dispatcher/InputDispatcher.cpp
+++ b/services/inputflinger/dispatcher/InputDispatcher.cpp
@@ -1981,17 +1981,48 @@
return true;
}
+/**
+ * Indicate whether one window handle should be considered as obscuring
+ * another window handle. We only check a few preconditions. Actually
+ * checking the bounds is left to the caller.
+ */
+static bool canBeObscuredBy(const sp<InputWindowHandle>& windowHandle,
+ const sp<InputWindowHandle>& otherHandle) {
+ // Compare by token so cloned layers aren't counted
+ if (haveSameToken(windowHandle, otherHandle)) {
+ return false;
+ }
+ auto info = windowHandle->getInfo();
+ auto otherInfo = otherHandle->getInfo();
+ if (!otherInfo->visible) {
+ return false;
+ } else if (info->ownerPid == otherInfo->ownerPid && otherHandle->getToken() == nullptr) {
+ // In general, if ownerPid is the same we don't want to generate occlusion
+ // events. This line is now necessary since we are including all Surfaces
+ // in occlusion calculation, so if we didn't check PID like this SurfaceView
+ // would occlude their parents. On the other hand before we started including
+ // all surfaces in occlusion calculation and had this line, we would count
+ // windows with an input channel from the same PID as occluding, and so we
+ // preserve this behavior with the getToken() == null check.
+ return false;
+ } else if (otherInfo->isTrustedOverlay()) {
+ return false;
+ } else if (otherInfo->displayId != info->displayId) {
+ return false;
+ }
+ return true;
+}
+
bool InputDispatcher::isWindowObscuredAtPointLocked(const sp<InputWindowHandle>& windowHandle,
int32_t x, int32_t y) const {
int32_t displayId = windowHandle->getInfo()->displayId;
const std::vector<sp<InputWindowHandle>> windowHandles = getWindowHandlesLocked(displayId);
for (const sp<InputWindowHandle>& otherHandle : windowHandles) {
- if (haveSameToken(otherHandle, windowHandle)) {
- break;
+ if (windowHandle == otherHandle) {
+ break; // All future windows are below us. Exit early.
}
-
const InputWindowInfo* otherInfo = otherHandle->getInfo();
- if (otherInfo->visible && !otherInfo->isTrustedOverlay() &&
+ if (canBeObscuredBy(windowHandle, otherHandle) &&
otherInfo->frameContainsPoint(x, y)) {
return true;
}
@@ -2004,12 +2035,11 @@
const std::vector<sp<InputWindowHandle>> windowHandles = getWindowHandlesLocked(displayId);
const InputWindowInfo* windowInfo = windowHandle->getInfo();
for (const sp<InputWindowHandle>& otherHandle : windowHandles) {
- if (haveSameToken(otherHandle, windowHandle)) {
- break;
+ if (windowHandle == otherHandle) {
+ break; // All future windows are below us. Exit early.
}
-
const InputWindowInfo* otherInfo = otherHandle->getInfo();
- if (otherInfo->visible && !otherInfo->isTrustedOverlay() &&
+ if (canBeObscuredBy(windowHandle, otherHandle) &&
otherInfo->overlaps(windowInfo)) {
return true;
}