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

Commit dcce13d5 authored by Kazuki Takise's avatar Kazuki Takise
Browse files

Allow invisible private presentations 

Private presentations can be shown only on private virtual
displays, so they are exempted from our new presentation policies.

However, one of the new policies introduced with
I33471146e072c6c53ef2ce8e1404394fb17f140a was unintentionally
applied to private presentations, thus it's causing a regression
on some systems that rely on private presentations to show UI.

Flag: com.android.window.flags.enable_presentation_for_connected_displays
Bug: 420923508
Bug: 417406465
Test: PresentationControllerTests
Change-Id: I7bbe7677059b6ece6c8f713c9e622b4e067f0ed7
parent 4b3c5110

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

+6 −2
Original line number Diff line number Diff line
@@ -3280,8 +3280,12 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP 
        }

    }



    boolean isPublicPresentation() {

        return mAttrs.type == TYPE_PRESENTATION;

    }



    boolean isPresentation() {

        return mAttrs.type == TYPE_PRESENTATION || mAttrs.type == TYPE_PRIVATE_PRESENTATION;

        return isPublicPresentation() || mAttrs.type == TYPE_PRIVATE_PRESENTATION;

    }



    private boolean isOnVirtualDisplay() {
@@ -5588,7 +5592,7 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP 
    void setViewVisibility(int viewVisibility) {

        mViewVisibility = viewVisibility;



        if (isPresentation()

        if (isPublicPresentation()

                && (viewVisibility == View.INVISIBLE || viewVisibility == View.GONE)) {

            mWmService.mPresentationController.removePresentation(getDisplayId(),

                    "setViewVisibility");

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

+52 −1
Original line number Diff line number Diff line
@@ -18,16 +18,20 @@ package com.android.server.wm; 


import static android.view.Display.DEFAULT_DISPLAY;

import static android.view.Display.FLAG_PRESENTATION;

import static android.view.Display.FLAG_PRIVATE;

import static android.view.Display.FLAG_TRUSTED;

import static android.view.WindowManager.TRANSIT_CLOSE;

import static android.view.WindowManager.TRANSIT_OPEN;

import static android.view.WindowManager.TRANSIT_WAKE;

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

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



import static com.android.dx.mockito.inline.extended.ExtendedMockito.doReturn;

import static com.android.window.flags.Flags.FLAG_ENABLE_PRESENTATION_FOR_CONNECTED_DISPLAYS;



import static org.junit.Assert.assertEquals;

import static org.junit.Assert.assertFalse;

import static org.junit.Assert.assertNull;

import static org.junit.Assert.assertTrue;

import static org.mockito.ArgumentMatchers.eq;
@@ -198,6 +202,32 @@ public class PresentationControllerTests extends WindowTestsBase { 
        assertFalse(window.isVisible());

    }



    @EnableFlags(FLAG_ENABLE_PRESENTATION_FOR_CONNECTED_DISPLAYS)

    @Test

    public void testInvisiblePrivatePresentationIsAllowed() {

        final int uid = Binder.getCallingUid();

        final Task task = createTask(mDefaultDisplay);

        task.effectiveUid = uid;

        final ActivityRecord activity = createActivityRecord(task);

        assertTrue(activity.isVisible());



        // Add a private presentation window on a private presentation display.

        final DisplayContent privateDisplay = createPrivatePresentationDisplay();

        final WindowState window = addPrivatePresentationWindow(uid,

                privateDisplay.getDisplayId());

        window.setViewVisibility(View.VISIBLE);

        final Transition addTransition = window.mTransitionController.getCollectingTransition();

        completeTransition(addTransition, /*abortSync=*/ true);

        assertTrue(window.isVisible());



        // Making the private presentation view invisible is allowed, thus no close transition runs.

        window.setViewVisibility(View.GONE);

        assertTrue(window.isVisible());

        waitHandlerIdle(window.mWmService.mAtmService.mH);

        assertNull(window.mTransitionController.getCollectingTransition());

        assertTrue(window.isVisible());

    }



    @EnableFlags(FLAG_ENABLE_PRESENTATION_FOR_CONNECTED_DISPLAYS)

    @Test

    public void testPresentationCannotLaunchOnNonPresentationDisplayWithoutHostHavingGlobalFocus() {
@@ -281,11 +311,20 @@ public class PresentationControllerTests extends WindowTestsBase { 
    }



    private WindowState addPresentationWindow(int uid, int displayId) {

        return addPresentationWindowInner(uid, displayId, false /* isPrivatePresentation */);

    }



    private WindowState addPrivatePresentationWindow(int uid, int displayId) {

        return addPresentationWindowInner(uid, displayId, true /* isPrivatePresentation */);

    }



    private WindowState addPresentationWindowInner(int uid, int displayId,

            boolean isPrivatePresentation) {

        final Session session = createTestSession(mAtm, 1234 /* pid */, uid);

        final int userId = UserHandle.getUserId(uid);

        doReturn(true).when(mWm.mUmInternal).isUserVisible(eq(userId), eq(displayId));

        final WindowManager.LayoutParams params = new WindowManager.LayoutParams(

                WindowManager.LayoutParams.TYPE_PRESENTATION);

                isPrivatePresentation ? TYPE_PRIVATE_PRESENTATION : TYPE_PRESENTATION);

        final IWindow clientWindow = new TestIWindow();

        final int res = mWm.addWindow(session, clientWindow, params, View.VISIBLE, displayId,

                userId, WindowInsets.Type.defaultVisible(), null, new InsetsState(),
@@ -315,9 +354,21 @@ public class PresentationControllerTests extends WindowTestsBase { 
    }



    private DisplayContent createPresentationDisplay() {

        return createPresentationDisplayInner(false /* isPrivateDisplay */);

    }



    private DisplayContent createPrivatePresentationDisplay() {

        return createPresentationDisplayInner(true /* isPrivateDisplay */);

    }



    private DisplayContent createPresentationDisplayInner(boolean isPrivateDisplay) {

        final DisplayInfo displayInfo = new DisplayInfo();

        displayInfo.copyFrom(mDisplayInfo);

        displayInfo.flags = FLAG_PRESENTATION | FLAG_TRUSTED;

        if (isPrivateDisplay) {

            displayInfo.flags |= FLAG_PRIVATE;

            displayInfo.ownerUid = Binder.getCallingUid();

        }

        displayInfo.displayId = DEFAULT_DISPLAY + 1;

        final DisplayContent dc = createNewDisplay(displayInfo);

        final int displayId = dc.getDisplayId();