From ff7dd3b9eacc1f7cb9415f39c8a042abef1c746d Mon Sep 17 00:00:00 2001 From: Siarhei Vishniakou Date: Mon, 31 Jul 2017 14:25:02 -0700 Subject: 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 Merged-In: Ie30dcc2402d5422a19a43ffe7d1411d91681efc2 Change-Id: I1dc5f003ada7ad3c753e078a8c1fbe10a89fb42f --- services/inputflinger/InputDispatcher.cpp | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/services/inputflinger/InputDispatcher.cpp b/services/inputflinger/InputDispatcher.cpp index 02fb6f04dd..381b6a87a5 100644 --- a/services/inputflinger/InputDispatcher.cpp +++ b/services/inputflinger/InputDispatcher.cpp @@ -1222,13 +1222,9 @@ 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; - } mTempTouchState.addOrUpdateWindow( - windowHandle, outsideTargetFlags, BitSet32(0)); + windowHandle, InputTarget::FLAG_DISPATCH_AS_OUTSIDE, BitSet32(0)); } } } -- cgit v1.2.3-59-g8ed1b