Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3b106104 authored by Michael Wright's avatar Michael Wright
Browse files

Remove window obscurement information from ACTION_OUTSIDE events. 

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 commandAndExit cts-dev -m CtsSecurityTestCases -t android.security.cts.MotionEventTest
Change-Id: Iea968ce23e018acf95116896a1ba4c065885b760
parent 6ae5c4f5

services/inputflinger/InputDispatcher.cpp

+1 −8
Original line number Diff line number Diff line
@@ -1224,15 +1224,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));

                }

            }

        }