From 95244dd6c0e7ccb85a32eaac94ecb3376fb3a095 Mon Sep 17 00:00:00 2001 From: dianlujitao Date: Tue, 26 Mar 2019 11:07:51 +0800 Subject: Transfer /dev/mtp_usb fd ownership when instancing MtpDevHandle /dev/mtp_usb was opened before instancing MtpDevHandle, the existing fd should be passed in otherwise MtpDevHandle::start would be blocked as it attempted to open the device twice. Change-Id: I6afc5b6926930dad77aceac2f6a00e1c6759a883 --- mtp/ffs/MtpServer.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mtp/ffs/MtpServer.cpp') 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); } } -- cgit v1.2.3