commit 3c00b093f88029db9ceed1a6a6f27e5c7ebf6b9b
author Shuzhen Wang <shuzhenwang@google.com> Tue Nov 08 22:53:07 2022 +0000
committer Shuzhen Wang <shuzhenwang@google.com> Wed Nov 16 23:53:37 2022 +0000
tree 39b109e4f519a6011672d10734b9551dde54d3b2
parent 2f0f76bfbfa9b295b9e35454311d6dccddbbc7de

Camera: Handle interaction between ZoomRatioMapper and zoom override

When figuring out the zoomRatio set by the application for a particular
capture, we should't use the frameNumber for the corresponding request.
Use the frameNumber of the newer request overriding the current request
instead.

Test: Camera CTS
Bug: 239822823
Change-Id: Ie8973698ec68608ddc4be9ed4d2ed2d06b9da268

camera/ndk/impl/ACameraMetadata.cpp

diff --git a/camera/ndk/impl/ACameraMetadata.cpp b/camera/ndk/impl/ACameraMetadata.cpp
index 936943c..4995dc4 100644
--- a/camera/ndk/impl/ACameraMetadata.cpp
+++ b/camera/ndk/impl/ACameraMetadata.cpp
@@ -587,6 +587,7 @@
     ANDROID_CONTROL_SCENE_MODE_OVERRIDES,
     ANDROID_CONTROL_AE_PRECAPTURE_ID,
     ANDROID_CONTROL_AF_TRIGGER_ID,
+    ANDROID_CONTROL_SETTINGS_OVERRIDING_FRAME_NUMBER,
     ANDROID_DEMOSAIC_MODE,
     ANDROID_EDGE_STRENGTH,
     ANDROID_FLASH_FIRING_POWER,