Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4458477e authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Avoid incomplete OutputConfiguration definition" into main am:... 

Merge "Avoid incomplete OutputConfiguration definition" into main am: dd9fbf4c am: a6330bc9 am: a8af3527

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2901160



Change-Id: I5e1d89b5c5d5faee44984e4ea4ec36ac7764e7c5
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e4c70753 a8af3527

camera/include/camera/camera2/SessionConfiguration.h

+2 −2
Original line number Diff line number Diff line
@@ -17,6 +17,8 @@ 
#ifndef ANDROID_HARDWARE_CAMERA2_SESSIONCONFIGURATION_H

#define ANDROID_HARDWARE_CAMERA2_SESSIONCONFIGURATION_H



#include "OutputConfiguration.h"



#include <binder/Parcelable.h>

#include <camera/CameraMetadata.h>
@@ -26,8 +28,6 @@ namespace hardware { 
namespace camera2 {

namespace params {



class OutputConfiguration;



class SessionConfiguration : public android::Parcelable {

public: