From 6f66de2cc98e48e2fd0346cd5bff1e1a27a3cad3 Mon Sep 17 00:00:00 2001
From: Sally Qi <sallyqi@google.com>
Date: Fri, 14 Jan 2022 15:25:38 -0800
Subject: [PATCH] Fix DataSpaceTest cts issue.

- Image#getDataSpace need to be overridden in ImageReader class to get
the expected dataspace.

Bug: 214374988
Test: android.hardware.cts.DataSpaceTest
Change-Id: Id58783e1bd768456228a892051c5b52d846394da
---
 media/java/android/media/ImageReader.java | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/media/java/android/media/ImageReader.java b/media/java/android/media/ImageReader.java
index 69ce8d2a3d93a..09d7fbd1df36a 100644
--- a/media/java/android/media/ImageReader.java
+++ b/media/java/android/media/ImageReader.java
@@ -1124,6 +1124,8 @@ public class ImageReader implements AutoCloseable {
     private class SurfaceImage extends android.media.Image {
         public SurfaceImage(int format) {
             mFormat = format;
+            mHardwareBufferFormat = ImageReader.this.mHardwareBufferFormat;
+            mDataSpace = ImageReader.this.mDataSpace;
         }
 
         SurfaceImage(int hardwareBufferFormat, long dataSpace) {
@@ -1228,6 +1230,12 @@ public class ImageReader implements AutoCloseable {
             return nativeGetHardwareBuffer();
         }
 
+        @Override
+        public long getDataSpace() {
+            throwISEIfImageIsInvalid();
+            return mDataSpace;
+        }
+
         @Override
         public void setTimestamp(long timestampNs) {
             throwISEIfImageIsInvalid();