fallout of view::Surface / Surface split
Test: built and booted device
Bug: treble
Change-Id: I022ebb581563463e93935da61a113087043dfeca
diff --git a/camera/camera2/CaptureRequest.cpp b/camera/camera2/CaptureRequest.cpp
index 4daf35b..0597950 100644
--- a/camera/camera2/CaptureRequest.cpp
+++ b/camera/camera2/CaptureRequest.cpp
@@ -23,11 +23,19 @@
#include <binder/Parcel.h>
#include <gui/Surface.h>
+#include <gui/view/Surface.h>
namespace android {
namespace hardware {
namespace camera2 {
+// These must be in the .cpp (to avoid inlining)
+CaptureRequest::CaptureRequest() = default;
+CaptureRequest::~CaptureRequest() = default;
+CaptureRequest::CaptureRequest(const CaptureRequest& rhs) = default;
+CaptureRequest::CaptureRequest(CaptureRequest&& rhs) noexcept = default;
+
+
status_t CaptureRequest::readFromParcel(const android::Parcel* parcel) {
if (parcel == NULL) {
ALOGE("%s: Null parcel", __FUNCTION__);
diff --git a/camera/camera2/OutputConfiguration.cpp b/camera/camera2/OutputConfiguration.cpp
index f570b7f..468a1eb 100644
--- a/camera/camera2/OutputConfiguration.cpp
+++ b/camera/camera2/OutputConfiguration.cpp
@@ -22,7 +22,7 @@
#include <camera/camera2/OutputConfiguration.h>
#include <binder/Parcel.h>
-#include <gui/Surface.h>
+#include <gui/view/Surface.h>
#include <utils/String8.h>
namespace android {
diff --git a/include/camera/camera2/CaptureRequest.h b/include/camera/camera2/CaptureRequest.h
index 978f48d..0180183 100644
--- a/include/camera/camera2/CaptureRequest.h
+++ b/include/camera/camera2/CaptureRequest.h
@@ -30,6 +30,16 @@
namespace camera2 {
struct CaptureRequest : public Parcelable {
+
+ // those are needed so we can use a forward declaration of Surface, otherwise
+ // the type is incomplete when the ctor/dtors are generated. This has the added
+ // benefit that ctor/dtors are not inlined, which is good because they're not trivial
+ // (because of the vtable and Vector<>)
+ CaptureRequest();
+ CaptureRequest(const CaptureRequest& rhs);
+ CaptureRequest(CaptureRequest&& rhs) noexcept;
+ virtual ~CaptureRequest();
+
CameraMetadata mMetadata;
Vector<sp<Surface> > mSurfaceList;
bool mIsReprocess;