Merge "[RESTRICT AUTOMERGE] Revert "Require permission to create trusted displays"" into rvc-dev (5c393cb8) · Commits · e / os / android_frameworks_base

core/java/android/app/ActivityView.java

+2 −13

Original line number	Diff line number	Diff line
		@@ -105,8 +105,7 @@ public class ActivityView extends ViewGroup implements android.window.TaskEmbedd
		public ActivityView(
		@NonNull Context context, @NonNull AttributeSet attrs, int defStyle,
		boolean singleTaskInstance, boolean usePublicVirtualDisplay) {
		this(context, attrs, defStyle, singleTaskInstance, usePublicVirtualDisplay,
		false /* disableSurfaceViewBackgroundLayer */);
		this(context, attrs, defStyle, singleTaskInstance, usePublicVirtualDisplay, false);
		}

		/** @hide */
		@@ -114,22 +113,12 @@ public class ActivityView extends ViewGroup implements android.window.TaskEmbedd
		@NonNull Context context, @NonNull AttributeSet attrs, int defStyle,
		boolean singleTaskInstance, boolean usePublicVirtualDisplay,
		boolean disableSurfaceViewBackgroundLayer) {
		this(context, attrs, defStyle, singleTaskInstance, usePublicVirtualDisplay,
		disableSurfaceViewBackgroundLayer, false /* useTrustedDisplay */);
		}

		// TODO(b/162901735): Refactor ActivityView with Builder
		/** @hide */
		public ActivityView(
		@NonNull Context context, @NonNull AttributeSet attrs, int defStyle,
		boolean singleTaskInstance, boolean usePublicVirtualDisplay,
		boolean disableSurfaceViewBackgroundLayer, boolean useTrustedDisplay) {
		super(context, attrs, defStyle);
		if (useTaskOrganizer()) {
		mTaskEmbedder = new TaskOrganizerTaskEmbedder(context, this);
		} else {
		mTaskEmbedder = new VirtualDisplayTaskEmbedder(context, this, singleTaskInstance,
		usePublicVirtualDisplay, useTrustedDisplay);
		usePublicVirtualDisplay);
		}
		mSurfaceView = new SurfaceView(context, null, 0, 0, disableSurfaceViewBackgroundLayer);
		// Since ActivityView#getAlpha has been overridden, we should use parent class's alpha

core/java/android/window/VirtualDisplayTaskEmbedder.java

+1 −8

Original line number	Diff line number	Diff line
		@@ -19,7 +19,6 @@ package android.window;
		import static android.hardware.display.DisplayManager.VIRTUAL_DISPLAY_FLAG_DESTROY_CONTENT_ON_REMOVAL;
		import static android.hardware.display.DisplayManager.VIRTUAL_DISPLAY_FLAG_OWN_CONTENT_ONLY;
		import static android.hardware.display.DisplayManager.VIRTUAL_DISPLAY_FLAG_PUBLIC;
		import static android.hardware.display.DisplayManager.VIRTUAL_DISPLAY_FLAG_TRUSTED;
		import static android.view.Display.INVALID_DISPLAY;

		import android.app.ActivityManager;
		@@ -64,7 +63,6 @@ public class VirtualDisplayTaskEmbedder extends TaskEmbedder {
		private int mDisplayDensityDpi;
		private final boolean mSingleTaskInstance;
		private final boolean mUsePublicVirtualDisplay;
		private final boolean mUseTrustedDisplay;
		private VirtualDisplay mVirtualDisplay;
		private Insets mForwardedInsets;
		private DisplayMetrics mTmpDisplayMetrics;
		@@ -79,12 +77,10 @@ public class VirtualDisplayTaskEmbedder extends TaskEmbedder {
		* only applicable if virtual displays are used
		*/
		public VirtualDisplayTaskEmbedder(Context context, VirtualDisplayTaskEmbedder.Host host,
		boolean singleTaskInstance, boolean usePublicVirtualDisplay,
		boolean useTrustedDisplay) {
		boolean singleTaskInstance, boolean usePublicVirtualDisplay) {
		super(context, host);
		mSingleTaskInstance = singleTaskInstance;
		mUsePublicVirtualDisplay = usePublicVirtualDisplay;
		mUseTrustedDisplay = useTrustedDisplay;
		}

		/**
		@@ -107,9 +103,6 @@ public class VirtualDisplayTaskEmbedder extends TaskEmbedder {
		if (mUsePublicVirtualDisplay) {
		virtualDisplayFlags \|= VIRTUAL_DISPLAY_FLAG_PUBLIC;
		}
		if (mUseTrustedDisplay) {
		virtualDisplayFlags \|= VIRTUAL_DISPLAY_FLAG_TRUSTED;
		}

		mVirtualDisplay = displayManager.createVirtualDisplay(
		DISPLAY_NAME + "@" + System.identityHashCode(this), mHost.getWidth(),

core/tests/coretests/AndroidManifest.xml

+0 −1

Original line number	Diff line number	Diff line
		@@ -129,7 +129,6 @@
		<!-- virtual display test permissions -->
		<uses-permission android:name="android.permission.CAPTURE_VIDEO_OUTPUT" />
		<uses-permission android:name="android.permission.CAPTURE_SECURE_VIDEO_OUTPUT" />
		<uses-permission android:name="android.permission.ADD_TRUSTED_DISPLAY" />

		<!-- color extraction test permissions -->
		<uses-permission android:name="android.permission.READ_FRAME_BUFFER" />

core/tests/coretests/src/android/hardware/display/VirtualDisplayTest.java

+0 −19

Original line number	Diff line number	Diff line
		@@ -247,25 +247,6 @@ public class VirtualDisplayTest extends AndroidTestCase {
		assertDisplayUnregistered(display);
		}

		/**
		* Ensures that an application can create a trusted virtual display with the permission
		* {@code ADD_TRUSTED_DISPLAY}.
		*/
		public void testTrustedVirtualDisplay() throws Exception {
		VirtualDisplay virtualDisplay = mDisplayManager.createVirtualDisplay(NAME,
		WIDTH, HEIGHT, DENSITY, mSurface,
		DisplayManager.VIRTUAL_DISPLAY_FLAG_TRUSTED);
		assertNotNull("virtual display must not be null", virtualDisplay);

		Display display = virtualDisplay.getDisplay();
		try {
		assertDisplayRegistered(display, Display.FLAG_PRIVATE \| Display.FLAG_TRUSTED);
		} finally {
		virtualDisplay.release();
		}
		assertDisplayUnregistered(display);
		}

		private void assertDisplayRegistered(Display display, int flags) {
		assertNotNull("display object must not be null", display);
		assertTrue("display must be valid", display.isValid());

packages/SystemUI/src/com/android/systemui/bubbles/BubbleExpandedView.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -301,7 +301,7 @@ public class BubbleExpandedView extends LinearLayout {

		mActivityView = new ActivityView(mContext, null /* attrs /, 0 / defStyle */,
		true /* singleTaskInstance /, false / usePublicVirtualDisplay*/,
		true /* disableSurfaceViewBackgroundLayer /, true / useTrustedDisplay */);
		true /* disableSurfaceViewBackgroundLayer */);

		// Set ActivityView's alpha value as zero, since there is no view content to be shown.
		setContentVisibility(false);