Merge "Delete Unsupported APIs" into main (c4afa312) · Commits · e / os / android_frameworks_base

core/java/android/view/SurfaceControl.java

+0 −95

Original line number	Diff line number	Diff line
		@@ -22,7 +22,6 @@ import static android.graphics.Matrix.MSKEW_X;
		import static android.graphics.Matrix.MSKEW_Y;
		import static android.graphics.Matrix.MTRANS_X;
		import static android.graphics.Matrix.MTRANS_Y;
		import static android.view.Display.INVALID_DISPLAY;
		import static android.view.SurfaceControlProto.HASH_CODE;
		import static android.view.SurfaceControlProto.LAYER_ID;
		import static android.view.SurfaceControlProto.NAME;
		@@ -38,7 +37,6 @@ import android.annotation.RequiresPermission;
		import android.annotation.Size;
		import android.annotation.TestApi;
		import android.compat.annotation.UnsupportedAppUsage;
		import android.content.Context;
		import android.graphics.ColorSpace;
		import android.graphics.GraphicBuffer;
		import android.graphics.Matrix;
		@@ -53,13 +51,8 @@ import android.hardware.HardwareBuffer;
		import android.hardware.OverlayProperties;
		import android.hardware.SyncFence;
		import android.hardware.display.DeviceProductInfo;
		import android.hardware.display.DisplayManager;
		import android.hardware.display.DisplayManagerGlobal;
		import android.hardware.display.DisplayedContentSample;
		import android.hardware.display.DisplayedContentSamplingAttributes;
		import android.hardware.display.IDisplayManager;
		import android.hardware.display.IVirtualDisplayCallback;
		import android.hardware.display.VirtualDisplay;
		import android.hardware.graphics.common.DisplayDecorationSupport;
		import android.opengl.EGLDisplay;
		import android.opengl.EGLSync;
		@@ -68,8 +61,6 @@ import android.os.IBinder;
		import android.os.Looper;
		import android.os.Parcel;
		import android.os.Parcelable;
		import android.os.RemoteException;
		import android.os.ServiceManager;
		import android.util.ArrayMap;
		import android.util.Log;
		import android.util.Slog;
		@@ -2354,92 +2345,6 @@ public final class SurfaceControl implements Parcelable {
		nativeSetGameContentType(displayToken, on);
		}

		/**
		* Because this API is now going through {@link DisplayManager}, orientation and displayRect
		* will automatically be computed based on configuration changes. Because of this, the params
		* orientation and displayRect are ignored
		*
		* @hide
		*/
		@UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.TIRAMISU,
		publicAlternatives = "Use {@code VirtualDisplay#resize(int, int, int)} instead.",
		trackingBug = 247078497)
		public static void setDisplayProjection(IBinder displayToken, int orientation,
		Rect layerStackRect, Rect displayRect) {
		DisplayManagerGlobal.getInstance().resizeVirtualDisplay(
		IVirtualDisplayCallback.Stub.asInterface(displayToken), layerStackRect.width(),
		layerStackRect.height(), 1);
		}

		/**
		* @hide
		*/
		@UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.TIRAMISU,
		publicAlternatives = "Use {@code MediaProjection#createVirtualDisplay()} with flag "
		+ " {@code VIRTUAL_DISPLAY_FLAG_AUTO_MIRROR} for mirroring instead.",
		trackingBug = 247078497)
		public static void setDisplayLayerStack(IBinder displayToken, int layerStack) {
		IBinder b = ServiceManager.getService(Context.DISPLAY_SERVICE);
		if (b == null) {
		throw new UnsupportedOperationException();
		}

		IDisplayManager dm = IDisplayManager.Stub.asInterface(b);
		try {
		dm.setDisplayIdToMirror(displayToken, layerStack);
		} catch (RemoteException e) {
		throw new UnsupportedOperationException(e);
		}
		}

		/**
		* @hide
		*/
		@UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.TIRAMISU,
		publicAlternatives = "Use {@code VirtualDisplay#setSurface(Surface)} instead.",
		trackingBug = 247078497)
		public static void setDisplaySurface(IBinder displayToken, Surface surface) {
		IVirtualDisplayCallback virtualDisplayCallback =
		IVirtualDisplayCallback.Stub.asInterface(displayToken);
		DisplayManagerGlobal dm = DisplayManagerGlobal.getInstance();
		dm.setVirtualDisplaySurface(virtualDisplayCallback, surface);
		}

		/**
		* Secure is no longer supported because this is only called from outside system which cannot
		* create secure displays.
		* @hide
		*/
		@UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.TIRAMISU,
		publicAlternatives = "Use {@code MediaProjection#createVirtualDisplay()} or "
		+ "{@code DisplayManager#createVirtualDisplay()} instead.",
		trackingBug = 247078497)
		public static IBinder createDisplay(String name, boolean secure) {
		if (name == null) {
		throw new IllegalArgumentException("name must not be null");
		}

		// We don't have a size yet so pass in 1 for width and height since 0 is invalid
		VirtualDisplay vd = DisplayManager.createVirtualDisplay(name, 1 /* width /, 1 / height */,
		INVALID_DISPLAY, null /* Surface */);
		return vd == null ? null : vd.getToken().asBinder();
		}

		/**
		* @hide
		*/
		@UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.TIRAMISU,
		publicAlternatives = "Use {@code VirtualDisplay#release()} instead.",
		trackingBug = 247078497)
		public static void destroyDisplay(IBinder displayToken) {
		if (displayToken == null) {
		throw new IllegalArgumentException("displayToken must not be null");
		}

		DisplayManagerGlobal.getInstance().releaseVirtualDisplay(
		IVirtualDisplayCallback.Stub.asInterface(displayToken));
		}

		/**
		* Returns whether protected content is supported in GPU composition.
		* @hide