Merge "Camera: Rename the extension latency query" into sc-dev (e723159e) · Commits · e / os / android_frameworks_base

core/api/current.txt

+1 −1

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

		public final class CameraExtensionCharacteristics {
		method @Nullable public android.util.Range<java.lang.Long> getEstimatedCaptureLatencyRange(int, @NonNull android.util.Size, int);
		method @Nullable public android.util.Range<java.lang.Long> getEstimatedCaptureLatencyRangeMillis(int, @NonNull android.util.Size, int);
		method @NonNull public <T> java.util.List<android.util.Size> getExtensionSupportedSizes(int, @NonNull Class<T>);
		method @NonNull public java.util.List<android.util.Size> getExtensionSupportedSizes(int, int);
		method @NonNull public java.util.List<java.lang.Integer> getSupportedExtensions();

+4 −1

Original line number	Diff line number	Diff line
		@@ -73,6 +73,9 @@ import java.util.Objects;
		* {@link CameraExtensionCharacteristics#getExtensionSupportedSizes(int, Class)} for supported
		* repeating request output sizes.</p>
		*
		* <p>The extension characteristics for a given device are expected to remain static under
		* normal operating conditions.</p>
		*
		* @see CameraManager#getCameraExtensionCharacteristics(String)
		*/
		public final class CameraExtensionCharacteristics {
		@@ -585,7 +588,7 @@ public final class CameraExtensionCharacteristics {
		* @throws IllegalArgumentException in case of format different from {@link ImageFormat#JPEG} /
		* {@link ImageFormat#YUV_420_888}; or unsupported extension.
		*/
		public @Nullable Range<Long> getEstimatedCaptureLatencyRange(@Extension int extension,
		public @Nullable Range<Long> getEstimatedCaptureLatencyRangeMillis(@Extension int extension,
		@NonNull Size captureOutputSize, @ImageFormat.Format int format) {
		switch (format) {
		case ImageFormat.YUV_420_888: