Merge "Incorporate API feedback for VirtualCameraConfig" into main (9df55bae) · Commits · e / os / android_frameworks_base

core/api/system-current.txt

+1 −2

Original line number	Diff line number	Diff line
		@@ -3388,11 +3388,10 @@ package android.companion.virtual.camera {
		}

		@FlaggedApi("android.companion.virtual.flags.virtual_camera") public static final class VirtualCameraConfig.Builder {
		ctor public VirtualCameraConfig.Builder();
		ctor public VirtualCameraConfig.Builder(@NonNull String);
		method @NonNull public android.companion.virtual.camera.VirtualCameraConfig.Builder addStreamConfig(@IntRange(from=1) int, @IntRange(from=1) int, int, @IntRange(from=1) int);
		method @NonNull public android.companion.virtual.camera.VirtualCameraConfig build();
		method @NonNull public android.companion.virtual.camera.VirtualCameraConfig.Builder setLensFacing(int);
		method @NonNull public android.companion.virtual.camera.VirtualCameraConfig.Builder setName(@NonNull String);
		method @NonNull public android.companion.virtual.camera.VirtualCameraConfig.Builder setSensorOrientation(int);
		method @NonNull public android.companion.virtual.camera.VirtualCameraConfig.Builder setVirtualCameraCallback(@NonNull java.util.concurrent.Executor, @NonNull android.companion.virtual.camera.VirtualCameraCallback);
		}

+6 −7

Original line number	Diff line number	Diff line
		@@ -196,13 +196,12 @@ public final class VirtualCameraConfig implements Parcelable {
		* <li>At least one stream must be added with {@link #addStreamConfig(int, int, int, int)}.
		* <li>A callback must be set with {@link #setVirtualCameraCallback(Executor,
		* VirtualCameraCallback)}
		* <li>A camera name must be set with {@link #setName(String)}
		* <li>A lens facing must be set with {@link #setLensFacing(int)}
		*/
		@FlaggedApi(Flags.FLAG_VIRTUAL_CAMERA)
		public static final class Builder {

		private String mName;
		private final String mName;
		private final ArraySet<VirtualCameraStreamConfig> mStreamConfigurations = new ArraySet<>();
		private Executor mCallbackExecutor;
		private VirtualCameraCallback mCallback;
		@@ -210,12 +209,12 @@ public final class VirtualCameraConfig implements Parcelable {
		private int mLensFacing = LENS_FACING_UNKNOWN;

		/**
		* Sets the name of the virtual camera instance.
		* Creates a new instance of {@link Builder}.
		*
		* @param name The name of the {@link VirtualCamera}.
		*/
		@NonNull
		public Builder setName(@NonNull String name) {
		mName = requireNonNull(name, "Display name cannot be null");
		return this;
		public Builder(@NonNull String name) {
		mName = requireNonNull(name, "Name cannot be null");
		}

		/**

+1 −2

Original line number	Diff line number	Diff line
		@@ -183,9 +183,8 @@ public class VirtualCameraControllerTest {
		private VirtualCameraConfig createVirtualCameraConfig(
		int width, int height, int format, int maximumFramesPerSecond,
		String name, int sensorOrientation, int lensFacing) {
		return new VirtualCameraConfig.Builder()
		return new VirtualCameraConfig.Builder(name)
		.addStreamConfig(width, height, format, maximumFramesPerSecond)
		.setName(name)
		.setVirtualCameraCallback(mCallbackHandler, mVirtualCameraCallbackMock)
		.setSensorOrientation(sensorOrientation)
		.setLensFacing(lensFacing)