Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add Dimmer to RootDisplayArea" into sc-dev

Browse Source
This commit is contained in:
Garfield Tan
2021-04-29 16:52:22 +00:00
committed by Android (Google) Code Review
parent 5dbfd93d4b f2dd033aad
commit efc43e9003
2 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/wm/RootDisplayArea.java
View File

@@ -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 * of the whole logical display, or a {@link DisplayAreaGroup} as the root of a partition of the
* logical display. * logical display.
*/ */
class RootDisplayArea extends DisplayArea<DisplayArea> { class RootDisplayArea extends DisplayArea.Dimmable {
/** {@link Feature} that are supported in this {@link DisplayArea} hierarchy. */ /** {@link Feature} that are supported in this {@link DisplayArea} hierarchy. */
List<DisplayAreaPolicyBuilder.Feature> mFeatures; List<DisplayAreaPolicyBuilder.Feature> mFeatures;

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

@@ -80,6 +80,7 @@ import android.util.DisplayMetrics;
import android.util.TypedXmlPullParser; import android.util.TypedXmlPullParser;
import android.util.TypedXmlSerializer; import android.util.TypedXmlSerializer;
import android.util.Xml; import android.util.Xml;
import android.view.Display;
import android.view.DisplayInfo; import android.view.DisplayInfo;
import androidx.test.filters.MediumTest; import androidx.test.filters.MediumTest;
@@ -1338,6 +1339,16 @@ public class TaskTests extends WindowTestsBase {
verify(display).onDescendantOrientationChanged(same(task)); 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() { private Task getTestTask() {
final Task task = new TaskBuilder(mSupervisor).setCreateActivity(true).build(); final Task task = new TaskBuilder(mSupervisor).setCreateActivity(true).build();
return task.getBottomMostTask(); return task.getBottomMostTask();