| commit | f981c6e9302da64437c2e2e163564e7b7022264a | [log] [tgz] |
|---|---|---|
| author | sgopal1 <saranya.gopal@intel.com> | Tue Oct 23 21:13:08 2018 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Oct 23 21:13:08 2018 -0700 |
| tree | 536de03b3dd34c5b94cbd69d33aff75ce6779726 | |
| parent | 5758fc4785d6cf0f84cad0174379012292684e63 [diff] | |
| parent | 8918b0994929c49d0f72cc140cab2a9c4fd2b077 [diff] |
Merge "MtpPacket: Add finite timeout for bulk transfer" am: e0bc1a9b8e am: 8918b09949 Change-Id: I944d6ba7f7446bd071998583b06ab671dea208fc
diff --git a/media/mtp/MtpPacket.cpp b/media/mtp/MtpPacket.cpp index 3dd4248..3b298a9 100644 --- a/media/mtp/MtpPacket.cpp +++ b/media/mtp/MtpPacket.cpp
@@ -157,7 +157,7 @@ request->endpoint, request->buffer, request->buffer_length, - 0); + 1000); request->actual_length = result; return result; }