commit 99d8d704a33d17ee69f1a30b6ab8cbdc20a19085
author Andy Hung <hunga@google.com> Wed Sep 18 22:35:53 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Sep 18 22:35:53 2024 +0000
tree c34d2231ac3e5be7220409cd56aceef4aad8b6ef
parent 60d8264ffeb29a33e633513fbc69f0dfc3119e9d
parent 3f2cee61af3e2197623d5abe0575ce765c442349

Merge "AudioFlinger: Protect initialization code in threadLoop with mutex" into main

camera/camera_platform.aconfig

diff --git a/camera/camera_platform.aconfig b/camera/camera_platform.aconfig
index b5d4ae5..bf1520b 100644
--- a/camera/camera_platform.aconfig
+++ b/camera/camera_platform.aconfig
@@ -218,3 +218,10 @@
     description: "Enable CameraServiceWatchdog to abort camera HAL to generate HAL tombstones"
     bug: "349652177"
 }
+
+flag {
+    namespace: "camera_platform"
+    name: "enable_stream_reconfiguration_for_unchanged_streams"
+    description: "Enable stream reconfiguration for unchanged streams"
+    bug: "341740105"
+}

services/camera/libcameraservice/device3/Camera3Stream.cpp

diff --git a/services/camera/libcameraservice/device3/Camera3Stream.cpp b/services/camera/libcameraservice/device3/Camera3Stream.cpp
index 4934203..ceb3d30 100644
--- a/services/camera/libcameraservice/device3/Camera3Stream.cpp
+++ b/services/camera/libcameraservice/device3/Camera3Stream.cpp
@@ -29,6 +29,9 @@
 #include "ui/GraphicBufferMapper.h"
 
 #include <cutils/properties.h>
+#include <com_android_internal_camera_flags.h>
+
+namespace flags = com::android::internal::camera::flags;
 
 namespace android {
 
@@ -388,6 +391,10 @@
             mOldDataSpace == camera_stream::data_space &&
             mOldFormat == camera_stream::format) {
         mState = STATE_CONFIGURED;
+        if (flags::enable_stream_reconfiguration_for_unchanged_streams()
+                && streamReconfigured != nullptr) {
+            *streamReconfigured = true;
+        }
         return OK;
     }