Merge "Camera: Unhide Key constructors" (6296773c) · Commits · e / os / android_frameworks_base

api/current.txt

+3 −0

Original line number	Diff line number	Diff line
		@@ -16680,6 +16680,7 @@ package android.hardware.camera2 {
		}

		public static final class CameraCharacteristics.Key<T> {
		ctor public CameraCharacteristics.Key(String, Class<T>);
		method @NonNull public String getName();
		}

		@@ -17051,6 +17052,7 @@ package android.hardware.camera2 {
		}

		public static final class CaptureRequest.Key<T> {
		ctor public CaptureRequest.Key(String, Class<T>);
		method @NonNull public String getName();
		}

		@@ -17145,6 +17147,7 @@ package android.hardware.camera2 {
		}

		public static final class CaptureResult.Key<T> {
		ctor public CaptureResult.Key(String, Class<T>);
		method @NonNull public String getName();
		}

+5 −5

Original line number	Diff line number	Diff line
		@@ -24,8 +24,6 @@ import android.hardware.camera2.impl.PublicKey;
		import android.hardware.camera2.impl.SyntheticKey;
		import android.hardware.camera2.params.RecommendedStreamConfigurationMap;
		import android.hardware.camera2.params.SessionConfiguration;
		import android.hardware.camera2.params.MandatoryStreamCombination;
		import android.hardware.camera2.params.MandatoryStreamCombination.MandatoryStreamInformation;
		import android.hardware.camera2.utils.ArrayUtils;
		import android.hardware.camera2.utils.TypeReference;
		import android.util.Rational;
		@@ -92,11 +90,13 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri
		}

		/**
		* Visible for testing and vendor extensions only.
		* Construct a new Key with a given name and type.
		*
		* @hide
		* <p>Normally, applications should use the existing Key definitions in
		* {@link CameraCharacteristics}, and not need to construct their own Key objects. However,
		* they may be useful for testing purposes and for defining custom camera
		* characteristics.</p>
		*/
		@UnsupportedAppUsage
		public Key(String name, Class<T> type) {
		mKey = new CameraMetadataNative.Key<T>(name, type);
		}

+4 −3

Original line number	Diff line number	Diff line
		@@ -114,11 +114,12 @@ public final class CaptureRequest extends CameraMetadata<CaptureRequest.Key<?>>
		}

		/**
		* Visible for testing and vendor extensions only.
		* Construct a new Key with a given name and type.
		*
		* @hide
		* <p>Normally, applications should use the existing Key definitions in
		* {@link CaptureRequest}, and not need to construct their own Key objects. However, they
		* may be useful for testing purposes and for defining custom capture request fields.</p>
		*/
		@UnsupportedAppUsage
		public Key(String name, Class<T> type) {
		mKey = new CameraMetadataNative.Key<T>(name, type);
		}

+4 −3

Original line number	Diff line number	Diff line
		@@ -94,11 +94,12 @@ public class CaptureResult extends CameraMetadata<CaptureResult.Key<?>> {
		}

		/**
		* Visible for testing and vendor extensions only.
		* Construct a new Key with a given name and type.
		*
		* @hide
		* <p>Normally, applications should use the existing Key definitions in
		* {@link CaptureResult}, and not need to construct their own Key objects. However, they may
		* be useful for testing purposes and for defining custom capture result fields.</p>
		*/
		@UnsupportedAppUsage
		public Key(String name, Class<T> type) {
		mKey = new CameraMetadataNative.Key<T>(name, type);
		}