| commit | 8918b0994929c49d0f72cc140cab2a9c4fd2b077 | [log] [tgz] |
|---|---|---|
| author | sgopal1 <saranya.gopal@intel.com> | Tue Oct 23 21:08:58 2018 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Oct 23 21:08:58 2018 -0700 |
| tree | 99ba6d14371d63d9c347b99aa1c8b629408a5449 | |
| parent | e4814339b23d6455403a479edad0936bc949251b [diff] | |
| parent | e0bc1a9b8ee77919211819d03404aca893f8bcbf [diff] |
Merge "MtpPacket: Add finite timeout for bulk transfer" am: e0bc1a9b8e Change-Id: I6ea4f15c5f95436cb2830316ec965b7f9449741e
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; }