Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Prevent a11y seeing behind tasks w/modal windows." into nyc-mr1-dev

Browse Source
This commit is contained in:
Phil Weaver
2016-07-29 19:16:37 +00:00
committed by Android (Google) Code Review
parent ba933b39ae ac9ad70086
commit a200e774e7
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
services/core/java/com/android/server/wm/AccessibilityController.java
View File

@@ -1071,14 +1071,15 @@ final class AccessibilityController {
Region.Op.REVERSE_DIFFERENCE);
}
// We figured out what is touchable for the entire screen - done.
if (unaccountedSpace.isEmpty()) {
break;
}
// If a window is modal it prevents other windows from being touched
if ((flags & (WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE
| WindowManager.LayoutParams.FLAG_NOT_TOUCH_MODAL)) == 0) {
// Account for all space in the task, whether the windows in it are
// touchable or not. The modal window blocks all touches from the task's
// area.
unaccountedSpace.op(windowState.getDisplayFrameLw(), unaccountedSpace,
Region.Op.REVERSE_DIFFERENCE);
if (task != null) {
// If the window is associated with a particular task, we can skip the
// rest of the windows for that task.
@@ -1090,6 +1091,10 @@ final class AccessibilityController {
break;
}
}
// We figured out what is touchable for the entire screen - done.
if (unaccountedSpace.isEmpty()) {
break;
}
}
// Always report the focused window.