Switch from ScopedFd to unique_fd.
ScopedFd is being deprecated.
Bug: 35856819
Test: Still builds on nyc-iot-dev, now builds on master too.
Change-Id: Ibf131cbac218d581beee17e70f83042289382f17
diff --git a/modules/camera/3_4/v4l2_wrapper.h b/modules/camera/3_4/v4l2_wrapper.h
index eb41239..c3ad272 100644
--- a/modules/camera/3_4/v4l2_wrapper.h
+++ b/modules/camera/3_4/v4l2_wrapper.h
@@ -24,7 +24,7 @@
#include <string>
#include <vector>
-#include <nativehelper/ScopedFd.h>
+#include <android-base/unique_fd.h>
#include "common.h"
#include "stream_format.h"
@@ -102,7 +102,7 @@
// The camera device path. For example, /dev/video0.
const std::string device_path_;
// The opened device fd.
- ScopedFd device_fd_;
+ android::base::unique_fd device_fd_;
// The underlying gralloc module.
std::unique_ptr<V4L2Gralloc> gralloc_;
// Whether or not the device supports the extended control query.