Merge "Fix DataSpaceTest cts issue."

2022-01-15 02:24:12 +00:00
parent c31d3083ab 6f66de2cc9
commit eba632d63d
1 changed files with 8 additions and 0 deletions
--- 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();