From 657ac11866ac5ef8790a234c9b8afcfb885ad457 Mon Sep 17 00:00:00 2001 From: Shuzhen Wang Date: Wed, 8 Mar 2023 22:11:39 +0000 Subject: [PATCH] Camera: Fix the internally used HAL_DATASPACE_HEIF color space enum Make HAL_DATASPACE_HEIF dataspace the same value as DataSpace.DATASPACE_HEIF. The enum is only used internally by StreamConfigurationMap. So this change has no impact on apps. Test: Camera CTS Bug: 245745739 Change-Id: Id183b43a99e95b7a59a04a95d13bdfc2e1816875 --- .../hardware/camera2/params/StreamConfigurationMap.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/core/java/android/hardware/camera2/params/StreamConfigurationMap.java b/core/java/android/hardware/camera2/params/StreamConfigurationMap.java index cb678b98a9980..5a48176d29e7f 100644 --- a/core/java/android/hardware/camera2/params/StreamConfigurationMap.java +++ b/core/java/android/hardware/camera2/params/StreamConfigurationMap.java @@ -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 */