diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2019-04-16 19:25:08 +0200 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-04-16 19:25:08 +0200 |
commit | bb0c6e1fe7b71fe9cc60b2fd867719de4f9ef8c1 (patch) | |
tree | f150e0e81a66d948c58960077a9a5c6369bf05f3 /minadbd | |
parent | Merge "Move wipe cache|data to libinstall" (diff) | |
parent | Remove the FD parameter from FuseDataProvider ctor. (diff) | |
download | android_bootable_recovery-bb0c6e1fe7b71fe9cc60b2fd867719de4f9ef8c1.tar android_bootable_recovery-bb0c6e1fe7b71fe9cc60b2fd867719de4f9ef8c1.tar.gz android_bootable_recovery-bb0c6e1fe7b71fe9cc60b2fd867719de4f9ef8c1.tar.bz2 android_bootable_recovery-bb0c6e1fe7b71fe9cc60b2fd867719de4f9ef8c1.tar.lz android_bootable_recovery-bb0c6e1fe7b71fe9cc60b2fd867719de4f9ef8c1.tar.xz android_bootable_recovery-bb0c6e1fe7b71fe9cc60b2fd867719de4f9ef8c1.tar.zst android_bootable_recovery-bb0c6e1fe7b71fe9cc60b2fd867719de4f9ef8c1.zip |
Diffstat (limited to '')
-rw-r--r-- | minadbd/fuse_adb_provider.h | 15 | ||||
-rw-r--r-- | minadbd/minadbd_services.cpp | 3 |
2 files changed, 8 insertions, 10 deletions
diff --git a/minadbd/fuse_adb_provider.h b/minadbd/fuse_adb_provider.h index 3fb689bd4..24a463d9b 100644 --- a/minadbd/fuse_adb_provider.h +++ b/minadbd/fuse_adb_provider.h @@ -14,25 +14,24 @@ * limitations under the License. */ -#ifndef __FUSE_ADB_PROVIDER_H -#define __FUSE_ADB_PROVIDER_H +#pragma once #include <stdint.h> -#include "android-base/unique_fd.h" - #include "fuse_provider.h" // This class reads data from adb server. class FuseAdbDataProvider : public FuseDataProvider { public: - FuseAdbDataProvider(android::base::unique_fd&& fd, uint64_t file_size, uint32_t block_size) - : FuseDataProvider(std::move(fd), file_size, block_size) {} + FuseAdbDataProvider(int fd, uint64_t file_size, uint32_t block_size) + : FuseDataProvider(file_size, block_size), fd_(fd) {} bool ReadBlockAlignedData(uint8_t* buffer, uint32_t fetch_size, uint32_t start_block) const override; void Close() override; -}; -#endif + private: + // The underlying source to read data from (i.e. the one that talks to the host). + int fd_; +}; diff --git a/minadbd/minadbd_services.cpp b/minadbd/minadbd_services.cpp index 79e6fc4e0..f2b65c09b 100644 --- a/minadbd/minadbd_services.cpp +++ b/minadbd/minadbd_services.cpp @@ -96,8 +96,7 @@ static void sideload_host_service(unique_fd sfd, const std::string& args) { exit(kMinadbdSocketIOError); } - auto adb_data_reader = - std::make_unique<FuseAdbDataProvider>(std::move(sfd), file_size, block_size); + auto adb_data_reader = std::make_unique<FuseAdbDataProvider>(sfd, file_size, block_size); if (int result = run_fuse_sideload(std::move(adb_data_reader)); result != 0) { LOG(ERROR) << "Failed to start fuse"; exit(kMinadbdFuseStartError); |