From 8328fde0ecb600b112a6024c175fa8ed87affcb0 Mon Sep 17 00:00:00 2001 From: Mark Renouf Date: Fri, 23 Jul 2021 11:33:42 -0400 Subject: Prevents scroll capture from targetting secure windows Bug: 194256552 Test: atest DisplayContentTests Change-Id: I436ff109ae26ff22f5d4367a82f0d391588d0a0f Merged-In: I436ff109ae26ff22f5d4367a82f0d391588d0a0f --- .../java/com/android/server/wm/DisplayContent.java | 5 ++++- .../com/android/server/wm/DisplayContentTests.java | 26 ++++++++++++++++++++++ 2 files changed, 30 insertions(+), 1 deletion(-) diff --git a/services/core/java/com/android/server/wm/DisplayContent.java b/services/core/java/com/android/server/wm/DisplayContent.java index 3144c87e8314..c7ae9fda05b5 100644 --- a/services/core/java/com/android/server/wm/DisplayContent.java +++ b/services/core/java/com/android/server/wm/DisplayContent.java @@ -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_TOUCHABLE; 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.LAST_APPLICATION_WINDOW; 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 */ } } - + if (nextWindow.isSecureLocked()) { + return false; /* continue */ + } return true; /* stop, match found */ } }); diff --git a/services/tests/wmtests/src/com/android/server/wm/DisplayContentTests.java b/services/tests/wmtests/src/com/android/server/wm/DisplayContentTests.java index d498d4663d78..745793cf5908 100644 --- a/services/tests/wmtests/src/com/android/server/wm/DisplayContentTests.java +++ b/services/tests/wmtests/src/com/android/server/wm/DisplayContentTests.java @@ -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.FLAG_LAYOUT_INSET_DECOR; 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.PRIVATE_FLAG_NO_MOVE_ANIMATION; import static android.view.WindowManager.LayoutParams.TYPE_APPLICATION; @@ -1745,6 +1746,31 @@ public class DisplayContentTests extends WindowTestsBase { 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 public void testFindScrollCaptureTargetWindow_taskId() { DisplayContent display = createNewDisplay(); -- cgit v1.2.3-59-g8ed1b