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

Merge "Prevents scroll capture from targetting secure windows" into sc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-07-26 23:35:11 +00:00
committed by Android (Google) Code Review
parent f69d25f7f2 8328fde0ec
commit 7ee0307aed
2 changed files with 30 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/core/java/com/android/server/wm/DisplayContent.java
View File

@@ -61,6 +61,7 @@ import static android.view.WindowManager.LayoutParams.FIRST_APPLICATION_WINDOW;
import static android.view.WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE; import static android.view.WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE;
import static android.view.WindowManager.LayoutParams.FLAG_NOT_TOUCHABLE; import static android.view.WindowManager.LayoutParams.FLAG_NOT_TOUCHABLE;
import static android.view.WindowManager.LayoutParams.FLAG_NOT_TOUCH_MODAL; import static android.view.WindowManager.LayoutParams.FLAG_NOT_TOUCH_MODAL;
import static android.view.WindowManager.LayoutParams.FLAG_SECURE;
import static android.view.WindowManager.LayoutParams.FLAG_SPLIT_TOUCH; import static android.view.WindowManager.LayoutParams.FLAG_SPLIT_TOUCH;
import static android.view.WindowManager.LayoutParams.LAST_APPLICATION_WINDOW; import static android.view.WindowManager.LayoutParams.LAST_APPLICATION_WINDOW;
import static android.view.WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_HIDDEN; import static android.view.WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_HIDDEN;
@@ -5829,7 +5830,9 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp
return false; /* continue */ return false; /* continue */
} }
} }
if (nextWindow.isSecureLocked()) {
return false; /* continue */
}
return true; /* stop, match found */ return true; /* stop, match found */
} }
}); });

26
services/tests/wmtests/src/com/android/server/wm/DisplayContentTests.java
View File

@@ -42,6 +42,7 @@ import static android.view.WindowInsetsController.BEHAVIOR_SHOW_TRANSIENT_BARS_B
import static android.view.WindowManager.LayoutParams.FIRST_SUB_WINDOW; import static android.view.WindowManager.LayoutParams.FIRST_SUB_WINDOW;
import static android.view.WindowManager.LayoutParams.FLAG_LAYOUT_INSET_DECOR; import static android.view.WindowManager.LayoutParams.FLAG_LAYOUT_INSET_DECOR;
import static android.view.WindowManager.LayoutParams.FLAG_LAYOUT_IN_SCREEN; import static android.view.WindowManager.LayoutParams.FLAG_LAYOUT_IN_SCREEN;
import static android.view.WindowManager.LayoutParams.FLAG_SECURE;
import static android.view.WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_SHORT_EDGES; import static android.view.WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_SHORT_EDGES;
import static android.view.WindowManager.LayoutParams.PRIVATE_FLAG_NO_MOVE_ANIMATION; import static android.view.WindowManager.LayoutParams.PRIVATE_FLAG_NO_MOVE_ANIMATION;
import static android.view.WindowManager.LayoutParams.TYPE_APPLICATION; import static android.view.WindowManager.LayoutParams.TYPE_APPLICATION;
@@ -1745,6 +1746,31 @@ public class DisplayContentTests extends WindowTestsBase {
assertEquals(activityWindow, result); assertEquals(activityWindow, result);
} }
@Test
public void testFindScrollCaptureTargetWindow_secure() {
DisplayContent display = createNewDisplay();
Task rootTask = createTask(display);
Task task = createTaskInRootTask(rootTask, 0 /* userId */);
WindowState secureWindow = createWindow(null, TYPE_APPLICATION, "Secure Window");
secureWindow.mAttrs.flags |= FLAG_SECURE;
WindowState result = display.findScrollCaptureTargetWindow(null,
ActivityTaskManager.INVALID_TASK_ID);
assertNull(result);
}
@Test
public void testFindScrollCaptureTargetWindow_secureTaskId() {
DisplayContent display = createNewDisplay();
Task rootTask = createTask(display);
Task task = createTaskInRootTask(rootTask, 0 /* userId */);
WindowState secureWindow = createWindow(null, TYPE_APPLICATION, "Secure Window");
secureWindow.mAttrs.flags |= FLAG_SECURE;
WindowState result = display.findScrollCaptureTargetWindow(null, task.mTaskId);
assertNull(result);
}
@Test @Test
public void testFindScrollCaptureTargetWindow_taskId() { public void testFindScrollCaptureTargetWindow_taskId() {
DisplayContent display = createNewDisplay(); DisplayContent display = createNewDisplay();