summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordianlujitao <dianlujitao@lineageos.org>2019-03-26 04:07:51 +0100
committerdianlujitao <dianlujitao@lineageos.org>2019-03-28 08:04:42 +0100
commit95244dd6c0e7ccb85a32eaac94ecb3376fb3a095 (patch)
tree8d59cd90ac5f9775c3d7f99271579a6f86f0c194
parentupdater: Allow devices to suppress BLKDISCARD (diff)
downloadandroid_bootable_recovery-95244dd6c0e7ccb85a32eaac94ecb3376fb3a095.tar
android_bootable_recovery-95244dd6c0e7ccb85a32eaac94ecb3376fb3a095.tar.gz
android_bootable_recovery-95244dd6c0e7ccb85a32eaac94ecb3376fb3a095.tar.bz2
android_bootable_recovery-95244dd6c0e7ccb85a32eaac94ecb3376fb3a095.tar.lz
android_bootable_recovery-95244dd6c0e7ccb85a32eaac94ecb3376fb3a095.tar.xz
android_bootable_recovery-95244dd6c0e7ccb85a32eaac94ecb3376fb3a095.tar.zst
android_bootable_recovery-95244dd6c0e7ccb85a32eaac94ecb3376fb3a095.zip
Diffstat (limited to '')
-rw-r--r--mtp/ffs/MtpDevHandle.cpp5
-rw-r--r--mtp/ffs/MtpDevHandle.h2
-rwxr-xr-xmtp/ffs/MtpServer.cpp2
3 files changed, 5 insertions, 4 deletions
diff --git a/mtp/ffs/MtpDevHandle.cpp b/mtp/ffs/MtpDevHandle.cpp
index d6a8b820d..e22ba55b2 100644
--- a/mtp/ffs/MtpDevHandle.cpp
+++ b/mtp/ffs/MtpDevHandle.cpp
@@ -33,8 +33,9 @@
constexpr char mtp_dev_path[] = "/dev/mtp_usb";
-MtpDevHandle::MtpDevHandle()
- : mFd(-1) {};
+MtpDevHandle::MtpDevHandle(int controlFd) {
+ mFd.reset(controlFd);
+}
MtpDevHandle::~MtpDevHandle() {}
diff --git a/mtp/ffs/MtpDevHandle.h b/mtp/ffs/MtpDevHandle.h
index 4b0692889..4ea1fdb2e 100644
--- a/mtp/ffs/MtpDevHandle.h
+++ b/mtp/ffs/MtpDevHandle.h
@@ -25,7 +25,7 @@ private:
android::base::unique_fd mFd;
public:
- MtpDevHandle();
+ MtpDevHandle(int controlFd);
~MtpDevHandle();
int read(void *data, size_t len);
int write(const void *data, size_t len);
diff --git a/mtp/ffs/MtpServer.cpp b/mtp/ffs/MtpServer.cpp
index 5f17ff2ff..fa6702433 100755
--- a/mtp/ffs/MtpServer.cpp
+++ b/mtp/ffs/MtpServer.cpp
@@ -123,7 +123,7 @@ MtpServer::MtpServer(IMtpDatabase* database, int controlFd, bool ptp,
mHandle = aio_compat ? new MtpFfsCompatHandle(controlFd) : new MtpFfsHandle(controlFd);
mHandle->writeDescriptors(mPtp);
} else {
- mHandle = new MtpDevHandle();
+ mHandle = new MtpDevHandle(controlFd);
}
}