summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSiarhei Vishniakou <svv@google.com>2017-08-10 22:18:33 +0000
committerSiarhei Vishniakou <svv@google.com>2017-08-10 22:18:33 +0000
commit2564b9fdf5250097fd6a243efea116989252a67a (patch)
treecb0ffce2add9527df07b7539e24fb5ac305be67d
parent788ff8c16f4157c21aac480a78dd9699bad0b1e3 (diff)
parent3cd049ca28818c5faefadea180aed91f1420c850 (diff)
downloadnative-2564b9fdf5250097fd6a243efea116989252a67a.tar.gz
[automerger] DO NOT MERGE Remove window obscurement information. am: edac95e737 am: dda3bdf8a8 am: 3cd049ca28
Change-Id: I75bc0db5679a6ae55c647b31f206755128fa47f7
-rw-r--r--services/inputflinger/InputDispatcher.cpp9
1 files changed, 1 insertions, 8 deletions
diff --git a/services/inputflinger/InputDispatcher.cpp b/services/inputflinger/InputDispatcher.cpp
index c9e876fd29..ec3ec7bde3 100644
--- a/services/inputflinger/InputDispatcher.cpp
+++ b/services/inputflinger/InputDispatcher.cpp
@@ -1222,15 +1222,8 @@ int32_t InputDispatcher::findTouchedWindowTargetsLocked(nsecs_t currentTime,
if (maskedAction == AMOTION_EVENT_ACTION_DOWN
&& (flags & InputWindowInfo::FLAG_WATCH_OUTSIDE_TOUCH)) {
- int32_t outsideTargetFlags = InputTarget::FLAG_DISPATCH_AS_OUTSIDE;
- if (isWindowObscuredAtPointLocked(windowHandle, x, y)) {
- outsideTargetFlags |= InputTarget::FLAG_WINDOW_IS_OBSCURED;
- } else if (isWindowObscuredLocked(windowHandle)) {
- outsideTargetFlags |= InputTarget::FLAG_WINDOW_IS_PARTIALLY_OBSCURED;
- }
-
mTempTouchState.addOrUpdateWindow(
- windowHandle, outsideTargetFlags, BitSet32(0));
+ windowHandle, InputTarget::FLAG_DISPATCH_AS_OUTSIDE, BitSet32(0));
}
}
}