commit 0475d911fcc1e6e1b4f49626f59a0a07038590fa
author Jerry Zhang <zhangjerry@google.com> Mon Apr 03 11:24:48 2017 -0700
committer Jerry Zhang <zhangjerry@google.com> Mon Apr 03 14:22:34 2017 -0700
tree 9c4f71008370a17223a80dfd9a0966fcbfdaafaf
parent 58a220fe06957cf7f0325cc9509947f1602e2986

Add timeout to lock in MtpServer configure

In situations where MtpServer is in a bad state, this will prevent
the configure call from blocking indefinitely, which will prevent
a few visible problems and allow the state to recover on the next
config change.

Bug: 34873000
Test: Connect to AA test sled
Change-Id: I5daf9cfcec69c967bde6bf3f6fd90e1c434e18bb

media/mtp/MtpFfsHandle.h

diff --git a/media/mtp/MtpFfsHandle.h b/media/mtp/MtpFfsHandle.h
index b4d5a97..7491a1b 100644
--- a/media/mtp/MtpFfsHandle.h
+++ b/media/mtp/MtpFfsHandle.h
@@ -36,7 +36,7 @@
 
     bool mPtp;
 
-    std::mutex mLock;
+    std::timed_mutex mLock;
 
     android::base::unique_fd mControl;
     // "in" from the host's perspective => sink for mtp server