Merge "Camera: Remove 'extension_10_bit' flagging" into main (31b50bb9) · Commits · e / os / android_frameworks_base

core/api/current.txt

+3 −3

Original line number	Diff line number	Diff line
		@@ -20083,14 +20083,14 @@ package android.hardware.camera2.params {

		public final class ExtensionSessionConfiguration {
		ctor public ExtensionSessionConfiguration(int, @NonNull java.util.List<android.hardware.camera2.params.OutputConfiguration>, @NonNull java.util.concurrent.Executor, @NonNull android.hardware.camera2.CameraExtensionSession.StateCallback);
		method @FlaggedApi("com.android.internal.camera.flags.extension_10_bit") public void clearColorSpace();
		method @FlaggedApi("com.android.internal.camera.flags.extension_10_bit") @Nullable public android.graphics.ColorSpace getColorSpace();
		method public void clearColorSpace();
		method @Nullable public android.graphics.ColorSpace getColorSpace();
		method @NonNull public java.util.concurrent.Executor getExecutor();
		method public int getExtension();
		method @NonNull public java.util.List<android.hardware.camera2.params.OutputConfiguration> getOutputConfigurations();
		method @Nullable public android.hardware.camera2.params.OutputConfiguration getPostviewOutputConfiguration();
		method @NonNull public android.hardware.camera2.CameraExtensionSession.StateCallback getStateCallback();
		method @FlaggedApi("com.android.internal.camera.flags.extension_10_bit") public void setColorSpace(@NonNull android.graphics.ColorSpace.Named);
		method public void setColorSpace(@NonNull android.graphics.ColorSpace.Named);
		method public void setPostviewOutputConfiguration(@Nullable android.hardware.camera2.params.OutputConfiguration);
		}

core/api/system-current.txt

+4 −4

Original line number	Diff line number	Diff line
		@@ -4972,12 +4972,12 @@ package android.hardware.camera2.extension {

		@FlaggedApi("com.android.internal.camera.flags.concert_mode") public final class CameraOutputSurface {
		ctor @FlaggedApi("com.android.internal.camera.flags.concert_mode") public CameraOutputSurface(@NonNull android.view.Surface, @NonNull android.util.Size);
		method @FlaggedApi("com.android.internal.camera.flags.extension_10_bit") public int getColorSpace();
		method @FlaggedApi("com.android.internal.camera.flags.extension_10_bit") public long getDynamicRangeProfile();
		method public int getColorSpace();
		method public long getDynamicRangeProfile();
		method @FlaggedApi("com.android.internal.camera.flags.concert_mode") public int getImageFormat();
		method @FlaggedApi("com.android.internal.camera.flags.concert_mode") @NonNull public android.util.Size getSize();
		method @FlaggedApi("com.android.internal.camera.flags.concert_mode") @NonNull public android.view.Surface getSurface();
		method @FlaggedApi("com.android.internal.camera.flags.extension_10_bit") public void setDynamicRangeProfile(long);
		method public void setDynamicRangeProfile(long);
		}

		@FlaggedApi("com.android.internal.camera.flags.concert_mode") public class CharacteristicsMap {
		@@ -4987,7 +4987,7 @@ package android.hardware.camera2.extension {

		@FlaggedApi("com.android.internal.camera.flags.concert_mode") public class ExtensionConfiguration {
		ctor @FlaggedApi("com.android.internal.camera.flags.concert_mode") public ExtensionConfiguration(int, int, @NonNull java.util.List<android.hardware.camera2.extension.ExtensionOutputConfiguration>, @Nullable android.hardware.camera2.CaptureRequest);
		method @FlaggedApi("com.android.internal.camera.flags.extension_10_bit") public void setColorSpace(int);
		method public void setColorSpace(int);
		}

		@FlaggedApi("com.android.internal.camera.flags.concert_mode") public class ExtensionOutputConfiguration {

core/java/android/hardware/camera2/extension/CameraOutputSurface.java

+0 −3

Original line number	Diff line number	Diff line
		@@ -107,7 +107,6 @@ public final class CameraOutputSurface {
		* {@link android.hardware.camera2.params.DynamicRangeProfiles.STANDARD}
		* unless specified by CameraOutputSurface.setDynamicRangeProfile.
		*/
		@FlaggedApi(Flags.FLAG_EXTENSION_10_BIT)
		public @DynamicRangeProfiles.Profile long getDynamicRangeProfile() {
		return mOutputSurface.dynamicRangeProfile;
		}
		@@ -118,7 +117,6 @@ public final class CameraOutputSurface {
		* unless specified by CameraOutputSurface.setColorSpace.
		*/
		@SuppressLint("MethodNameUnits")
		@FlaggedApi(Flags.FLAG_EXTENSION_10_BIT)
		public int getColorSpace() {
		return mOutputSurface.colorSpace;
		}
		@@ -128,7 +126,6 @@ public final class CameraOutputSurface {
		* will be {@link android.hardware.camera2.params.DynamicRangeProfiles.STANDARD}
		* unless explicitly set using this method.
		*/
		@FlaggedApi(Flags.FLAG_EXTENSION_10_BIT)
		public void setDynamicRangeProfile(
		@DynamicRangeProfiles.Profile long dynamicRangeProfile) {
		mOutputSurface.dynamicRangeProfile = dynamicRangeProfile;

core/java/android/hardware/camera2/extension/ExtensionConfiguration.java

+1 −6

Original line number	Diff line number	Diff line
		@@ -83,7 +83,6 @@ public class ExtensionConfiguration {
		* The default will be -1, indicating an unspecified ColorSpace,
		* unless explicitly set using this method.
		*/
		@FlaggedApi(Flags.FLAG_EXTENSION_10_BIT)
		public void setColorSpace(int colorSpace) {
		mColorSpace = colorSpace;
		}
		@@ -98,11 +97,7 @@ public class ExtensionConfiguration {
		ret.sessionTemplateId = mSessionTemplateId;
		ret.sessionType = mSessionType;
		ret.outputConfigs = new ArrayList<>(mOutputs.size());
		if (Flags.extension10Bit()) {
		ret.colorSpace = mColorSpace;
		} else {
		ret.colorSpace = ColorSpaceProfiles.UNSPECIFIED;
		}
		for (ExtensionOutputConfiguration outputConfig : mOutputs) {
		ret.outputConfigs.add(outputConfig.getOutputConfig());
		}

core/java/android/hardware/camera2/extension/ExtensionOutputConfiguration.java

+1 −5

Original line number	Diff line number	Diff line
		@@ -80,11 +80,7 @@ public class ExtensionOutputConfiguration {
		config.outputId = new OutputConfigId();
		config.outputId.id = mOutputConfigId;
		config.surfaceGroupId = mSurfaceGroupId;
		if (Flags.extension10Bit()) {
		config.dynamicRangeProfile = surface.getDynamicRangeProfile();
		} else {
		config.dynamicRangeProfile = DynamicRangeProfiles.STANDARD;
		}
		}

		@Nullable CameraOutputConfig getOutputConfig() {