Snap for 7553867 from e3451b87d4da7467390383800c59eb607df123ee to sc-release

Change-Id: Ic34a12917d5f54a3e0df01e280d988c9f27fa330

1 files changed, 2 insertions, 18 deletions

diff --git a/common/hal/google_camera_hal/zsl_snapshot_capture_session.cc b/common/hal/google_camera_hal/zsl_snapshot_capture_session.cc
index 56fb96d..a7c0fd8 100644
--- a/common/hal/google_camera_hal/zsl_snapshot_capture_session.cc
+++ b/common/hal/google_camera_hal/zsl_snapshot_capture_session.cc
@@ -163,17 +163,12 @@ bool ZslSnapshotCaptureSession::IsStreamConfigurationSupported(
     return false;
   }
 
-  bool has_physical_camera_stream = false;
-  bool has_non_physical_camera_stream = false;
   bool has_jpeg_stream = false;
   bool has_preview_stream = false;
-  std::set<int> physical_camera_in_use;
   for (const auto& stream : stream_config.streams) {
     if (stream.is_physical_camera_stream) {
-      has_physical_camera_stream = true;
-      physical_camera_in_use.insert(stream.physical_camera_id);
-    } else {
-      has_non_physical_camera_stream = true;
+      ALOGE("%s: support logical camera only", __FUNCTION__);
+      return false;
     }
     if (utils::IsJPEGSnapshotStream(stream)) {
       has_jpeg_stream = true;
@@ -194,17 +189,6 @@ bool ZslSnapshotCaptureSession::IsStreamConfigurationSupported(
     return false;
   }
 
-  if (has_physical_camera_stream && has_non_physical_camera_stream) {
-    ALOGE("%s: support only physical camera or logical camera, but not both",
-          __FUNCTION__);
-    return false;
-  }
-
-  if (has_physical_camera_stream && physical_camera_in_use.size() != 1) {
-    ALOGE("%s: support only 1 physical camera, but %d have set up streams",
-          __FUNCTION__, static_cast<int>(physical_camera_in_use.size()));
-  }
-
   ALOGD("%s: ZslSnapshotCaptureSession supports the stream config",
         __FUNCTION__);
   return true;