Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1de1f342 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Camera: Rename the extension latency query" into sc-dev am: e723159e 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14298065

Change-Id: Ibffa11b3d3915c302df00bcd04a7f552fc550efa
parents 3ada89a3 e723159e

core/api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -18047,7 +18047,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();

























core/java/android/hardware/camera2/CameraExtensionCharacteristics.java



+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: