commit 2eb29c0d79d88be7dcf2ce7092773d246a8abe6a
author Treehugger Robot <treehugger-gerrit@google.com> Fri Nov 10 21:56:43 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Nov 10 21:56:43 2017 +0000
tree f9f2e975c8fbd79968f06f42282e1092b1daf2f2
parent 2a18bd96f64285bc615c3db5355142a83eb2a165
parent fbc8b0683630a0f14dda04f71da7df9a5f13821f

Merge "Always set sys.usb.ffs.mtp.ready during configure"

media/mtp/MtpFfsHandle.cpp

diff --git a/media/mtp/MtpFfsHandle.cpp b/media/mtp/MtpFfsHandle.cpp
index cb9827f..217e0c9 100644
--- a/media/mtp/MtpFfsHandle.cpp
+++ b/media/mtp/MtpFfsHandle.cpp
@@ -311,7 +311,7 @@
 
 int MtpFfsHandle::configure(bool usePtp) {
     // Wait till previous server invocation has closed
-    if (!mLock.try_lock_for(std::chrono::milliseconds(1000))) {
+    if (!mLock.try_lock_for(std::chrono::milliseconds(300))) {
         LOG(ERROR) << "MtpServer was unable to get configure lock";
         return -1;
     }

media/mtp/MtpServer.cpp

diff --git a/media/mtp/MtpServer.cpp b/media/mtp/MtpServer.cpp
index 7b3e96e..6080868 100644
--- a/media/mtp/MtpServer.cpp
+++ b/media/mtp/MtpServer.cpp
@@ -134,12 +134,11 @@
             sHandle = new MtpDevHandle();
         }
     }
-    if (sHandle->configure(usePtp)) {
-        ALOGE("Failed to configure Mtp driver!");
-        return -1;
-    }
+
+    int ret = sHandle->configure(usePtp);
+    if (ret) ALOGE("Failed to configure MTP driver!");
     android::base::SetProperty("sys.usb.ffs.mtp.ready", "1");
-    return 0;
+    return ret;
 }
 
 void MtpServer::addStorage(MtpStorage* storage) {