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

Commit 01ba4b29 authored by Garfield Tan's avatar Garfield Tan Committed by Automerger Merge Worker
Browse files

Merge "Add Dimmer to RootDisplayArea" into sc-dev am: efc43e90 

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

Change-Id: I819b076c51284d194fd9f03e8e23512c9f4981ae
parents 50fee809 efc43e90

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

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ import java.util.Map; 
 * of the whole logical display, or a {@link DisplayAreaGroup} as the root of a partition of the

 * logical display.

 */

class RootDisplayArea extends DisplayArea<DisplayArea> {

class RootDisplayArea extends DisplayArea.Dimmable {



    /** {@link Feature} that are supported in this {@link DisplayArea} hierarchy. */

    List<DisplayAreaPolicyBuilder.Feature> mFeatures;

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

+11 −0
Original line number Diff line number Diff line
@@ -80,6 +80,7 @@ import android.util.DisplayMetrics; 
import android.util.TypedXmlPullParser;

import android.util.TypedXmlSerializer;

import android.util.Xml;

import android.view.Display;

import android.view.DisplayInfo;



import androidx.test.filters.MediumTest;
@@ -1338,6 +1339,16 @@ public class TaskTests extends WindowTestsBase { 
        verify(display).onDescendantOrientationChanged(same(task));

    }



    @Test

    public void testGetNonNullDimmerOnUntrustedDisplays() {

        final DisplayInfo untrustedDisplayInfo = new DisplayInfo(mDisplayInfo);

        untrustedDisplayInfo.flags &= ~Display.FLAG_TRUSTED;

        final DisplayContent untrustedDisplay = createNewDisplay(untrustedDisplayInfo);

        final ActivityRecord activity = createActivityRecord(untrustedDisplay);

        activity.setOccludesParent(false);

        assertNotNull(activity.getTask().getDimmer());

    }



    private Task getTestTask() {

        final Task task = new TaskBuilder(mSupervisor).setCreateActivity(true).build();

        return task.getBottomMostTask();