commit f19aba2ab497405f52df09c64f017e1b570d380b
author TreeHugger Robot <treehugger-gerrit@google.com> Tue May 03 17:19:01 2022 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue May 03 17:19:01 2022 +0000
tree 23387c16e84acb586f4bc282a29ada4251674e9f
parent 34eb60a114c5a8c5466562e09d214ff264e3f571
parent b77131a48131681b8c8f859daf74bf6061b9625a

Merge "Camera: Allow vendor stream use case unconditionally." into tm-dev

services/camera/libcameraservice/utils/SessionConfigurationUtils.cpp

diff --git a/services/camera/libcameraservice/utils/SessionConfigurationUtils.cpp b/services/camera/libcameraservice/utils/SessionConfigurationUtils.cpp
index 4090dae..a46266e 100644
--- a/services/camera/libcameraservice/utils/SessionConfigurationUtils.cpp
+++ b/services/camera/libcameraservice/utils/SessionConfigurationUtils.cpp
@@ -322,6 +322,10 @@
             streamUseCase == ANDROID_SCALER_AVAILABLE_STREAM_USE_CASES_DEFAULT) {
         return true;
     }
+    // Allow vendor stream use case unconditionally.
+    if (streamUseCase >= ANDROID_SCALER_AVAILABLE_STREAM_USE_CASES_VENDOR_START) {
+        return true;
+    }
 
     for (size_t i = 0; i < availableStreamUseCases.count; i++) {
         if (availableStreamUseCases.data.i64[i] == streamUseCase) {