c947b10f996a381eb3dfa5cfacb353e87da86d31 - platform/frameworks/base

commit	c947b10f996a381eb3dfa5cfacb353e87da86d31	[log] [tgz]
author	Charles Chen <charlesccchen@google.com>	Tue Oct 13 01:14:25 2020 +0000
committer	Charles Chen <charlesccchen@google.com>	Tue Oct 13 01:14:25 2020 +0000
tree	4236759a663af90e224e246fcf36c9f0d37a2f30
parent	ae03031efe8b751f4513b42cad68db4559a8edfd [diff]

[RESTRICT AUTOMERGE] Revert "[RESTRICT AUTOMERGE] Revert "Require permission to create trusted displays""

This reverts commit ae03031efe8b751f4513b42cad68db4559a8edfd.

Reason for revert: Merge the reverted patch by accident.

Bug: 162627132
Change-Id: Ic2f072730050cb47926cec6ed24af7ef9e5e7055

core/java/android/app/ActivityView.java[diff]
core/java/android/window/VirtualDisplayTaskEmbedder.java[diff]
core/tests/coretests/AndroidManifest.xml[diff]
core/tests/coretests/src/android/hardware/display/VirtualDisplayTest.java[diff]
packages/SystemUI/src/com/android/systemui/bubbles/BubbleExpandedView.java[diff]
services/core/java/com/android/server/display/DisplayManagerService.java[diff]

6 files changed