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

Commit fe8265d5 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Prevents scroll capture from targetting secure windows" into sc-dev am: 7ee0307a 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15374948

Change-Id: Ib82bb7493168be0477f6631f41eca24e7bead5b9
parents 11b8259c 7ee0307a

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

+4 −1
Original line number Original line 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_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;
@@ -5854,7 +5855,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 */

            }

            }

        });

        });

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

+26 −0
Original line number Original line 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.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;
@@ -1735,6 +1736,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();