commit cc87be4ba0679eff5fd44b850c866c467009803e
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Thu Apr 04 23:02:52 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Apr 04 23:02:52 2024 +0000
tree 4588577598bcc2e31b192c99175126182105d0e9
parent d7b9e61d1a09fe72086240bf9272d4aef1eb7e4f
parent 6fd0b7bef328608652ca3a75961fc3c47a4824ef

Merge "Camera: Disable surface usage caching for external surfaces" into 24D1-dev

services/camera/libcameraservice/device3/Camera3OutputStream.cpp

diff --git a/services/camera/libcameraservice/device3/Camera3OutputStream.cpp b/services/camera/libcameraservice/device3/Camera3OutputStream.cpp
index 8c6fa8f..3cd4543 100644
--- a/services/camera/libcameraservice/device3/Camera3OutputStream.cpp
+++ b/services/camera/libcameraservice/device3/Camera3OutputStream.cpp
@@ -1030,7 +1030,8 @@
 
 status_t Camera3OutputStream::getEndpointUsageForSurface(uint64_t *usage,
         const sp<Surface>& surface) {
-    if (mConsumerUsageCachedValue.has_value() && flags::surface_ipc()) {
+    bool internalConsumer = (mConsumer.get() != nullptr) && (mConsumer == surface);
+    if (mConsumerUsageCachedValue.has_value() && flags::surface_ipc() && internalConsumer) {
         *usage = mConsumerUsageCachedValue.value();
         return OK;
     }
@@ -1039,7 +1040,9 @@
 
     res = native_window_get_consumer_usage(static_cast<ANativeWindow*>(surface.get()), usage);
     applyZSLUsageQuirk(camera_stream::format, usage);
-    mConsumerUsageCachedValue = *usage;
+    if (internalConsumer) {
+        mConsumerUsageCachedValue = *usage;
+    }
     return res;
 }