mtp

Merge lp://staging/~phablet-team/mtp/aosp-update into lp://staging/mtp

  1. aosp-update
  2. Merge into trunk
Proposed by Alfonso Sanchez-Beato
Status: Merged
Approved by: Konrad Zapałowicz
Approved revision: 74
Merged at revision: 70
Proposed branch: lp://staging/~phablet-team/mtp/aosp-update
Merge into: lp://staging/mtp
Diff against target: 2258 lines (+634/-357)
25 files modified
CMakeLists.txt (+1/-1)
include/MtpDataPacket.h (+13/-12)
include/MtpDevice.h (+1/-1)
include/MtpDeviceInfo.h (+2/-2)
include/MtpObjectInfo.h (+1/-1)
include/MtpPacket.h (+4/-4)
include/MtpProperty.h (+7/-7)
include/MtpRequestPacket.h (+4/-0)
include/MtpServer.h (+1/-0)
include/MtpStorageInfo.h (+1/-1)
include/MtpStringBuffer.h (+5/-2)
server/UbuntuMtpDatabase.h (+48/-37)
server/server.cpp (+25/-23)
src/MtpDataPacket.cpp (+129/-55)
src/MtpDevice.cpp (+33/-14)
src/MtpDeviceInfo.cpp (+19/-12)
src/MtpObjectInfo.cpp (+22/-20)
src/MtpPacket.cpp (+1/-1)
src/MtpProperty.cpp (+63/-42)
src/MtpRequestPacket.cpp (+17/-4)
src/MtpServer.cpp (+170/-64)
src/MtpStorageInfo.cpp (+11/-9)
src/MtpStringBuffer.cpp (+36/-24)
src/MtpUtils.cpp (+19/-20)
tests/TestMtpUtils.cpp (+1/-1)
To merge this branch: bzr merge lp://staging/~phablet-team/mtp/aosp-update
Reviewer Review Type Date Requested Status
Konrad Zapałowicz (community) code Approve
Simon Fels Approve
Review via email: mp+291626@code.staging.launchpad.net

Commit message

* Update to latest AOSP code (Marshallow)
* Make MTP work for file > 4GB (LP: #1472789). This involved adding O_LARGEFILE flag when opening a file (the flag is automatically added by bionic, but not by glibc) and fixing parts of the MTP database implementation.

Description of the change

* Update to latest AOSP code (Marshallow)
* Make MTP work for file > 4GB (LP: #1472789). This involved adding O_LARGEFILE flag when opening a file (the flag is automatically added by bionic, but not by glibc) and fixing parts of the MTP database implementation.

To post a comment you must log in.
Revision history for this message
Konrad Zapałowicz (kzapalowicz) wrote :

Minor issues mostly related to type-safety

review: Needs Fixing (code)
Revision history for this message
Alfonso Sanchez-Beato (alfonsosanchezbeato) wrote :

Thanks for the thorough review. However, most of the code comes directly from AOSP, and I have preferred in many cases to minimize the difference between our project and "upstream" to ease future merges. AOSP code can be found in:

https://android.googlesource.com/platform/frameworks/av/

lp://staging/~phablet-team/mtp/aosp-update updated
74. By Alfonso Sanchez-Beato

Address review comments

Revision history for this message
Alfonso Sanchez-Beato (alfonsosanchezbeato) wrote :

Branch refreshed after addressing review comments.

Revision history for this message
Simon Fels (morphis) wrote :

LGTM

review: Approve
Revision history for this message
Konrad Zapałowicz (kzapalowicz) wrote :

Approved

review: Approve (code)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes: