From aee0d658d634a530723388b417aebdb0abb97ee7 Mon Sep 17 00:00:00 2001
From: Emilian Peev <epeev@google.com>
Date: Wed, 21 Jul 2021 14:37:18 -0700
Subject: [PATCH] Camera: Include the parceled image dimensions

All parceled images need to include valid and correct
dimensions.

Bug: 194324683
Test: Manual using extensions sample application,
Camera CTS

Change-Id: I5ba90757e6edb0bb6bf1756d158c7ee402ce54ca
---
 .../camera2/impl/CameraAdvancedExtensionSessionImpl.java        | 2 ++
 .../hardware/camera2/impl/CameraExtensionSessionImpl.java       | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/core/java/android/hardware/camera2/impl/CameraAdvancedExtensionSessionImpl.java b/core/java/android/hardware/camera2/impl/CameraAdvancedExtensionSessionImpl.java
index bfc1f2765c3b9..eff4b734b0779 100644
--- a/core/java/android/hardware/camera2/impl/CameraAdvancedExtensionSessionImpl.java
+++ b/core/java/android/hardware/camera2/impl/CameraAdvancedExtensionSessionImpl.java
@@ -812,6 +812,8 @@ public final class CameraAdvancedExtensionSessionImpl extends CameraExtensionSes
                     Log.e(TAG,"Failed to parcel buffer fence!");
                 }
             }
+            parcelImage.width = img.getWidth();
+            parcelImage.height = img.getHeight();
             parcelImage.format = img.getFormat();
             parcelImage.timestamp = img.getTimestamp();
             parcelImage.transform = img.getTransform();
diff --git a/core/java/android/hardware/camera2/impl/CameraExtensionSessionImpl.java b/core/java/android/hardware/camera2/impl/CameraExtensionSessionImpl.java
index 537b894d9a6a6..39ebcecad2c30 100644
--- a/core/java/android/hardware/camera2/impl/CameraExtensionSessionImpl.java
+++ b/core/java/android/hardware/camera2/impl/CameraExtensionSessionImpl.java
@@ -1640,6 +1640,8 @@ public final class CameraExtensionSessionImpl extends CameraExtensionSession {
                 Log.e(TAG,"Failed to parcel buffer fence!");
             }
         }
+        parcelImage.width = img.getWidth();
+        parcelImage.height = img.getHeight();
         parcelImage.format = img.getFormat();
         parcelImage.timestamp = img.getTimestamp();
         parcelImage.transform = img.getTransform();