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

Commit 131de933 authored by Shuzhen Wang's avatar Shuzhen Wang Committed by Automerger Merge Worker
Browse files

Merge "Camera: Fix the internally used HAL_DATASPACE_HEIF color space enum"... 

Merge "Camera: Fix the internally used HAL_DATASPACE_HEIF color space enum" into udc-dev am: 056fab6d

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



Change-Id: Id05beca2c3dbfdddfd78ae56a286bd3389bc2278
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 369d9dbd 056fab6d

core/java/android/hardware/camera2/params/StreamConfigurationMap.java

+1 −2
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ import android.hardware.camera2.CameraMetadata; 
import android.hardware.camera2.CaptureRequest;

import android.hardware.camera2.utils.HashCodeHelpers;

import android.hardware.camera2.utils.SurfaceUtils;

import android.util.Log;

import android.util.Range;

import android.util.Size;

import android.util.SparseIntArray;
@@ -2019,7 +2018,7 @@ public final class StreamConfigurationMap { 
    /**

     * @hide

     */

    public static final int HAL_DATASPACE_HEIF = 0x1003;

    public static final int HAL_DATASPACE_HEIF = 0x1004;

    /**

     * @hide

     */