commit 9066766c0f6fc1c9282023070de2abacaa25a6df
author Yin-Chia Yeh <yinchiayeh@google.com> Mon Jul 01 15:45:00 2019 -0700
committer Yin-Chia Yeh <yinchiayeh@google.com> Tue Jul 02 11:00:01 2019 -0700
tree 4484bcdfea9726e072ec7c56eb4317950ff742f8
parent 9694a99645a42c23d489ce605e5cea4fdc0e1936

Camera: fix format overriden logic

Original logic was comparing an overridden format int, switch
to use a const original format.

Test: partner device, Pixel 3 CTS
Bug: 136456900
Change-Id: I03d6e190770ee05e40446c417e323f546fdc2689

services/camera/libcameraservice/device3/Camera3Device.cpp

diff --git a/services/camera/libcameraservice/device3/Camera3Device.cpp b/services/camera/libcameraservice/device3/Camera3Device.cpp
index 9771f9e..a8e80fa 100644
--- a/services/camera/libcameraservice/device3/Camera3Device.cpp
+++ b/services/camera/libcameraservice/device3/Camera3Device.cpp
@@ -4364,7 +4364,7 @@
         int overrideFormat = mapToFrameworkFormat(src.v3_2.overrideFormat);
         android_dataspace overrideDataSpace = mapToFrameworkDataspace(src.overrideDataSpace);
 
-        if (dst->format != HAL_PIXEL_FORMAT_IMPLEMENTATION_DEFINED) {
+        if (dstStream->getOriginalFormat() != HAL_PIXEL_FORMAT_IMPLEMENTATION_DEFINED) {
             dstStream->setFormatOverride(false);
             dstStream->setDataSpaceOverride(false);
             if (dst->format != overrideFormat) {