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

Commit f1bc1631 authored by Mark Renouf's avatar Mark Renouf
Browse files

Prevents scroll capture from targetting secure windows 

Bug: 194256552
Test: atest DisplayContentTests
Change-Id: I436ff109ae26ff22f5d4367a82f0d391588d0a0f
parent def65d88

services/core/java/com/android/server/wm/DisplayContent.java

+4 −1
Original line number Diff line number Diff line
@@ -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.LAST_APPLICATION_WINDOW;

import static android.view.WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_HIDDEN;

import static android.view.WindowManager.LayoutParams.SOFT_INPUT_STATE_HIDDEN;
@@ -5839,7 +5840,9 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp 
                        return false; /* continue */

                    }

                }



                if (nextWindow.isSecureLocked()) {

                    return false; /* continue */

                }

                return true; /* stop, match found */

            }

        });

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

+26 −0
Original line number Diff line number Diff line
@@ -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;
@@ -1747,6 +1748,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();