commit dd9fbf4c70df5b420d01f905096b884beda69f93
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Tue Jan 09 22:41:55 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jan 09 22:41:55 2024 +0000
tree a927d25f8b1d7bb3ac191aebcba0010849d2f98e
parent df80e7f6454a24b0cfdc88f0fceef65dc9bba5bf
parent 99d245b01254d1262050a2c7f9cfeb6fe6437c35

Merge "Avoid incomplete OutputConfiguration definition" into main

camera/include/camera/camera2/SessionConfiguration.h

diff --git a/camera/include/camera/camera2/SessionConfiguration.h b/camera/include/camera/camera2/SessionConfiguration.h
index 29913f6..73fafb4 100644
--- a/camera/include/camera/camera2/SessionConfiguration.h
+++ b/camera/include/camera/camera2/SessionConfiguration.h
@@ -17,6 +17,8 @@
 #ifndef ANDROID_HARDWARE_CAMERA2_SESSIONCONFIGURATION_H
 #define ANDROID_HARDWARE_CAMERA2_SESSIONCONFIGURATION_H
 
+#include "OutputConfiguration.h"
+
 #include <binder/Parcelable.h>
 
 namespace android {
@@ -25,8 +27,6 @@
 namespace camera2 {
 namespace params {
 
-class OutputConfiguration;
-
 class SessionConfiguration : public android::Parcelable {
 public: