diff options
| author | Siarhei Vishniakou <svv@google.com> | 2017-08-04 12:37:47 -0700 |
|---|---|---|
| committer | Ivan Kutepov <its.kutepov@gmail.com> | 2017-11-10 18:08:28 +0300 |
| commit | b2cc7deac7747b0b1f5156f9f4b22413eb410d5f (patch) | |
| tree | 745f6f7e94d8be4179c2e532e88e1abc6a71ce40 | |
| parent | ea0521baee31e4b98caeab665e39610f67c3f035 (diff) | |
| download | frameworks_native-b2cc7deac7747b0b1f5156f9f4b22413eb410d5f.tar.gz frameworks_native-b2cc7deac7747b0b1f5156f9f4b22413eb410d5f.tar.bz2 frameworks_native-b2cc7deac7747b0b1f5156f9f4b22413eb410d5f.zip | |
DO NOT MERGE Remove window obscurement information.
If ACTION_OUTSIDE_EVENTS contain information about whether the touch is
obscured, then a pattern of invisible, untouchable, unfocusable
SYSTEM_ALERT_WINDOWS can be placed across the screen to determine
approximate locations of touch events without the user knowing.
Bug: 31097064
Test: cts-tradefed run cts --class android.security.cts.MotionEventTest
Change-Id: Iebbb68231cbb76f87241201e7640a1fe3e188625
CVE-2017-0860
| -rw-r--r-- | services/inputflinger/InputDispatcher.cpp | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/services/inputflinger/InputDispatcher.cpp b/services/inputflinger/InputDispatcher.cpp index c9e876fd2..ec3ec7bde 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)); } } } |