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

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

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

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



Change-Id: I2df352000f2eb90088124cd4084aa8d516592a55
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 543e82fc a6330bc9

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>



namespace android {
@@ -25,8 +27,6 @@ namespace hardware { 
namespace camera2 {

namespace params {



class OutputConfiguration;



class SessionConfiguration : public android::Parcelable {

public: