aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-03-16Merge "Add METADATA for libmtp" am: b23e73eaa0 am: 9b8a742210android-mainline-10.0.0_r9android-mainline-10.0.0_r7android-mainline-10.0.0_r5android-mainline-10.0.0_r4android-mainline-10.0.0_r10android-10.0.0_r9android-10.0.0_r8android-10.0.0_r7android-10.0.0_r45android-10.0.0_r44android-10.0.0_r43android-10.0.0_r42android-10.0.0_r41android-10.0.0_r40android-10.0.0_r39android-10.0.0_r38android-10.0.0_r37android-10.0.0_r36android-10.0.0_r35android-10.0.0_r34android-10.0.0_r33android-10.0.0_r32android-10.0.0_r31android-10.0.0_r30android-10.0.0_r29android-10.0.0_r28android-10.0.0_r27android-10.0.0_r26android-10.0.0_r25android-10.0.0_r24android-10.0.0_r23android-10.0.0_r22android-10.0.0_r21android-10.0.0_r20android-10.0.0_r19android-10.0.0_r18android-10.0.0_r16android-10.0.0_r15android-10.0.0_r14android-10.0.0_r13android-10.0.0_r12android10-qpr3-s1-releaseandroid10-qpr3-releaseandroid10-qpr2-s4-releaseandroid10-qpr2-s3-releaseandroid10-qpr2-s2-releaseandroid10-qpr2-s1-releaseandroid10-qpr2-releaseandroid10-qpr1-releaseandroid10-qpr1-mainline-releaseandroid10-qpr1-d-releaseandroid10-qpr1-c-s1-releaseandroid10-qpr1-c-releaseandroid10-qpr1-b-s1-releaseandroid10-qpr1-b-releaseandroid10-mainline-media-releaseandroid10-devandroid10-d4-s1-releaseandroid10-d4-releaseandroid10-c2f2-s2-releaseandroid10-c2f2-s1-releaseandroid10-c2f2-releaseHaibo Huang
am: 13549a555e Change-Id: I475cb34d0db8542fefeb552feaa81540074f2aaa
2019-03-16Merge "Add METADATA for libmtp" am: b23e73eaa0Haibo Huang
am: 9b8a742210 Change-Id: I1520e256fc21214fa9a3289b5e1ff9a0f84953a8
2019-03-16Merge "Add METADATA for libmtp"Haibo Huang
am: b23e73eaa0 Change-Id: Ia40bf5fb8a4ed790a28ae30eb341af41051fd298
2019-03-16Merge "Add METADATA for libmtp"Haibo Huang
2019-03-16Add METADATA for libmtpHaibo Huang
Exempt-From-Owner-Approval: No code change Test: NA Change-Id: Idb53e1a591c188799f7c7ed580525950e1da1b42
2019-02-25Merge stage-aosp-master into pi-dev-plus-aospXin Li
am: b1fe39abc5 Change-Id: Iddc7074f84dc3793372807f7892b12ba197d00fa
2019-02-25Merge stage-aosp-master into pi-dev-plus-aospXin Li
Bug: 126125118 Change-Id: I66e016306de2a82876b35a9f5ea6b2de1de290ef
2019-02-20DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-masterXin Li
Bug: 120848293 Change-Id: I6522cde7954179ef310c0e84395582ab00a002e1
2019-01-16Merge "Add default code reviewers into OWNERS" am: e2b4559bb6 am: 060d652e5aChih-hung Hsieh
am: 5bd4a6dc37 Change-Id: I576f894a804e57179f6c9eacc64b6cd416e8b1ee
2019-01-16Merge "Add default code reviewers into OWNERS" am: e2b4559bb6Chih-hung Hsieh
am: 060d652e5a Change-Id: I1054551c3d3cb340a88c140d858a3d94f9c35837
2019-01-16Merge "Add default code reviewers into OWNERS"Chih-hung Hsieh
am: e2b4559bb6 Change-Id: Iaa3ebdf76c2dee860741106ecbff9c41c69a036b
2019-01-16Merge "Add default code reviewers into OWNERS"Chih-hung Hsieh
2019-01-09Add default code reviewers into OWNERSChih-Hung Hsieh
Bug: 33166666 Test: gerrit uploader Change-Id: I6d0810e448ec933678d97b3c7b0b26eb9e3c7bda
2018-12-10[automerger skipped] Merge "DO NOT MERGE" am: 9f6b4eb0b8 -s ours am: ↵Xin Li
bb82e91324 -s ours am: 156c92145b -s ours Change-Id: I8026c8093b88e1fc7c7279a024fb97b9ffd8206e
2018-12-10[automerger skipped] Merge "DO NOT MERGE" am: 9f6b4eb0b8 -s oursXin Li
am: bb82e91324 -s ours Change-Id: I4af7bd7639df825a8f66cd955a38c534cb5fa8ae
2018-12-10[automerger skipped] Merge "DO NOT MERGE"Xin Li
am: 9f6b4eb0b8 -s ours Change-Id: I2f075a9a9b46e0764567761f309259654d50cb04
2018-12-10Merge "DO NOT MERGE"Treehugger Robot
2018-12-07DO NOT MERGEXin Li
Merge pie-platform-release (PPRL.181205.001, history only) into master Bug: 120502534 Change-Id: If98b3dd8b1b0074ac910094b8ee492b7234831de
2017-12-14Snap for 4502278 from f5dd4c21b33cdfc3e98c8b4b4406f78dd1e2bede to pi-releaseandroid-vts-9.0_r9android-vts-9.0_r8android-vts-9.0_r7android-vts-9.0_r6android-vts-9.0_r5android-vts-9.0_r4android-vts-9.0_r19android-vts-9.0_r18android-vts-9.0_r17android-vts-9.0_r16android-vts-9.0_r15android-vts-9.0_r14android-vts-9.0_r13android-vts-9.0_r12android-vts-9.0_r11android-vts-9.0_r10android-security-9.0.0_r76android-security-9.0.0_r75android-security-9.0.0_r74android-security-9.0.0_r73android-security-9.0.0_r72android-security-9.0.0_r71android-security-9.0.0_r70android-security-9.0.0_r69android-security-9.0.0_r68android-security-9.0.0_r67android-security-9.0.0_r66android-security-9.0.0_r65android-security-9.0.0_r64android-security-9.0.0_r63android-security-9.0.0_r62android-p-preview-5android-p-preview-4android-p-preview-1android-cts-9.0_r9android-cts-9.0_r8android-cts-9.0_r7android-cts-9.0_r6android-cts-9.0_r5android-cts-9.0_r4android-cts-9.0_r3android-cts-9.0_r20android-cts-9.0_r2android-cts-9.0_r19android-cts-9.0_r18android-cts-9.0_r17android-cts-9.0_r16android-cts-9.0_r15android-cts-9.0_r14android-cts-9.0_r13android-cts-9.0_r12android-cts-9.0_r11android-cts-9.0_r10android-cts-9.0_r1android-9.0.0_r9android-9.0.0_r8android-9.0.0_r7android-9.0.0_r61android-9.0.0_r60android-9.0.0_r6android-9.0.0_r59android-9.0.0_r58android-9.0.0_r57android-9.0.0_r56android-9.0.0_r55android-9.0.0_r54android-9.0.0_r53android-9.0.0_r52android-9.0.0_r51android-9.0.0_r50android-9.0.0_r5android-9.0.0_r49android-9.0.0_r48android-9.0.0_r3android-9.0.0_r2android-9.0.0_r18android-9.0.0_r17android-9.0.0_r10android-9.0.0_r1security-pi-releasepie-vts-releasepie-security-releasepie-s2-releasepie-release-2pie-releasepie-r2-s2-releasepie-r2-s1-releasepie-r2-releasepie-platform-releasepie-gsipie-cuttlefish-testingpie-cts-releasepie-arcp-preview-1android-build-team Robot
Change-Id: If2e536f65376a1b5e71e8d7f528bab5b0f4fab7e
2017-12-14Merge "Add metadata" am: bd454345fe am: 980d7b00eeandroid-wear-9.0.0_r9android-wear-9.0.0_r8android-wear-9.0.0_r7android-wear-9.0.0_r6android-wear-9.0.0_r5android-wear-9.0.0_r4android-wear-9.0.0_r34android-wear-9.0.0_r33android-wear-9.0.0_r32android-wear-9.0.0_r31android-wear-9.0.0_r30android-wear-9.0.0_r3android-wear-9.0.0_r29android-wear-9.0.0_r28android-wear-9.0.0_r27android-wear-9.0.0_r26android-wear-9.0.0_r25android-wear-9.0.0_r24android-wear-9.0.0_r23android-wear-9.0.0_r22android-wear-9.0.0_r21android-wear-9.0.0_r20android-wear-9.0.0_r2android-wear-9.0.0_r19android-wear-9.0.0_r18android-wear-9.0.0_r17android-wear-9.0.0_r16android-wear-9.0.0_r15android-wear-9.0.0_r14android-wear-9.0.0_r13android-wear-9.0.0_r12android-wear-9.0.0_r11android-wear-9.0.0_r10android-wear-9.0.0_r1android-p-preview-3android-p-preview-2android-9.0.0_r47android-9.0.0_r46android-9.0.0_r45android-9.0.0_r44android-9.0.0_r43android-9.0.0_r42android-9.0.0_r41android-9.0.0_r40android-9.0.0_r39android-9.0.0_r38android-9.0.0_r37android-9.0.0_r36android-9.0.0_r35android-9.0.0_r34android-9.0.0_r33android-9.0.0_r32android-9.0.0_r31android-9.0.0_r30android-9.0.0_r22android-9.0.0_r21android-9.0.0_r20android-9.0.0_r19android-9.0.0_r16android-9.0.0_r12android-9.0.0_r11pie-qpr3-s1-releasepie-qpr3-releasepie-qpr3-b-releasepie-qpr2-releasepie-qpr1-s3-releasepie-qpr1-s2-releasepie-qpr1-s1-releasepie-qpr1-releasepie-dr1-releasepie-dr1-devpie-devpie-b4s4-releasepie-b4s4-devmaster-cuttlefish-testing-releaseBill Yi
am: 0deb91b779 Change-Id: I9e137eeef9c00f6678296ee92e054e8453d030d3
2017-12-14Merge "Add metadata" am: bd454345feBill Yi
am: 980d7b00ee Change-Id: I87681f4f641269a96e927fc76e506e5de93a5218
2017-12-14Merge "Add metadata"Bill Yi
am: bd454345fe Change-Id: I597193d15aaf7b280146b1f26ec9fdd111e1ce89
2017-12-14Merge "Add metadata"android-wear-p-preview-2Treehugger Robot
2017-12-13Add metadataBill Yi
BUG:67772237 Change-Id: Ic7973b2c5c08be994f872fee0b3548275813aee1
2017-10-18Snap for 4402171 from 192d5037c9afea642c077cbc4540974e494f20e0 to pi-releaseandroid-build-team Robot
Change-Id: If11305dfb4b11b6723223cc0c651dc28de1a11f2
2017-10-18Merge changes I234b2f09,Ifdca65fc am: 4c8326f8bb am: 70b080a741 am: baa7658ccdJerry Zhang
am: db90191d1a Change-Id: I9b1659179609cf2841476ddbbabcc65fc169f825
2017-10-18Merge changes I8ddc4e9a,I650fe105,Ie16cd99e am: f229188e94 am: 68851ea546 ↵Jerry Zhang
am: 6af12b33c9 am: 14faca166c Change-Id: Ia141ae5b7e4cf2ec8ec96fe6ba573fdce96be52d
2017-10-18Merge changes I0416b952,I53785040 am: b082e3dcac am: be6bd95db1 am: 6a43605f98Jerry Zhang
am: 4d2768c95a Change-Id: Ic45f11a3e8db9349178a3be0f3119fb37f26776a
2017-10-18Merge changes I44124d22,I8d01048f am: 05ffbaed02 am: 1aee04c92c am: 73b01df980Yingxi Yu
am: 18ee9db1e5 Change-Id: I0d4c60505b7e69242466fe85641703735edf3c46
2017-10-18Merge changes I234b2f09,Ifdca65fc am: 4c8326f8bb am: 70b080a741Jerry Zhang
am: baa7658ccd Change-Id: I696a133e6ef8eb1b294506fa4d15b8bc375d58cc
2017-10-18Merge changes I8ddc4e9a,I650fe105,Ie16cd99e am: f229188e94 am: 68851ea546Jerry Zhang
am: 6af12b33c9 Change-Id: I588011e64c2fea1f07dc32e36cd444c8306f9d05
2017-10-18Merge changes I0416b952,I53785040 am: b082e3dcac am: be6bd95db1Jerry Zhang
am: 6a43605f98 Change-Id: Id395f9f36192f0360387b9a92611a04972633053
2017-10-18Merge changes I44124d22,I8d01048f am: 05ffbaed02 am: 1aee04c92cYingxi Yu
am: 73b01df980 Change-Id: Ie1cae9a9a49fcf135eec0a3ff8edf810b4bea522
2017-10-18Merge changes I234b2f09,Ifdca65fc am: 4c8326f8bbJerry Zhang
am: 70b080a741 Change-Id: Ib8a420f3502f5fef3b8b6c267b28df63f7b2427a
2017-10-18Merge changes I8ddc4e9a,I650fe105,Ie16cd99e am: f229188e94Jerry Zhang
am: 68851ea546 Change-Id: I187bf8ba447f8c5fb91b886e8e0ac902ced753b4
2017-10-18Merge changes I0416b952,I53785040 am: b082e3dcacJerry Zhang
am: be6bd95db1 Change-Id: Ib6442a37710f98f138e90af1e73682e5a0bf0e7b
2017-10-18Merge changes I44124d22,I8d01048f am: 05ffbaed02Yingxi Yu
am: 1aee04c92c Change-Id: I6da29eb0e91c3cd4c732659005409e628ed412dc
2017-10-18Merge changes I234b2f09,Ifdca65fcJerry Zhang
am: 4c8326f8bb Change-Id: Ie5dec66495a51a55a3eb6e3939d43b9a8623e045
2017-10-18Merge changes I8ddc4e9a,I650fe105,Ie16cd99eJerry Zhang
am: f229188e94 Change-Id: I45d461f8d637ac103c3f2721986885081465b60c
2017-10-18Merge changes I0416b952,I53785040Jerry Zhang
am: b082e3dcac Change-Id: I9a0ac97096bd30fdde7a372c6909a3c8668275be
2017-10-18Merge changes I44124d22,I8d01048fYingxi Yu
am: 05ffbaed02 Change-Id: Icdc2dab8de1d88eda6ce77547362b40d53ab8cee
2017-10-18Merge changes I234b2f09,Ifdca65fcTreehugger Robot
* changes: Fix 4G file transfer on 32 bit. Look for glibtoolize if libtoolize is not found.
2017-10-18Merge changes I8ddc4e9a,I650fe105,Ie16cd99eTreehugger Robot
* changes: Add AFT specific extensions to libmtp. Merge branch 'master' of https://git.code.sf.net/p/libmtp/code Merge tag 'libmtp-1-0-1'
2017-10-18Merge changes I0416b952,I53785040Treehugger Robot
* changes: Move libmtp to upstream libmtp-1-0-1 in preparation for fast forward. Fix build error.
2017-10-18Merge changes I44124d22,I8d01048fTreehugger Robot
* changes: USB3 device support libmtp: Support > 4GB file transfers
2017-06-15Fix 4G file transfer on 32 bit.android-o-mr1-iot-release-smart-display-r9android-o-mr1-iot-release-smart-display-r8android-o-mr1-iot-release-smart-display-r5android-o-mr1-iot-release-smart-display-r40.1Jandroid-o-mr1-iot-release-smart-display-r4android-o-mr1-iot-release-smart-display-r39android-o-mr1-iot-release-smart-display-r30android-o-mr1-iot-release-smart-display-r3android-o-mr1-iot-release-smart-display-r22android-o-mr1-iot-release-smart-display-r14android-o-mr1-iot-release-smart-clock-r6android-o-mr1-iot-release-smart-clock-r2android-o-mr1-iot-release-smart-clock-fsiandroid-o-mr1-iot-release-smart-clock-fcsandroid-o-mr1-iot-release-cube_r2android-o-mr1-iot-release-cube-fsiandroid-o-mr1-iot-release-cube-fcsandroid-o-mr1-iot-release-1.0.8android-o-mr1-iot-release-1.0.7android-o-mr1-iot-release-1.0.5android-o-mr1-iot-release-1.0.4android-o-mr1-iot-release-1.0.3android-o-mr1-iot-release-1.0.2android-o-mr1-iot-release-1.0.14android-o-mr1-iot-release-1.0.13android-o-mr1-iot-release-1.0.12android-o-mr1-iot-release-1.0.10android-o-mr1-iot-release-1.0.1android-o-mr1-iot-release-1.0.0android-o-mr1-iot-preview-8android-o-mr1-iot-preview-7android-o-mr1-iot-preview-6oreo-mr1-iot-releaseoreo-mr1-devoreo-mr1-1.2-iot-releaseo-mr1-iot-preview-8o-mr1-iot-preview-7o-mr1-iot-preview-6Jerry Zhang
ptp_usb_senddata will store file size in a uint64_t, but ptp_write_func casts this down to an unsigned long, which is 32 bits on i386. To fix, break up transfers into pieces less than ULONG_MAX rounded down by packet size.
2017-06-15Look for glibtoolize if libtoolize is not found.Jerry Zhang
libtoolize is sometimes installed as glibtoolize on Darwin.
2017-06-13Add AFT specific extensions to libmtp.Jerry Zhang
2017-06-13Merge branch 'master' of https://git.code.sf.net/p/libmtp/codeJerry Zhang
2017-06-13Merge tag 'libmtp-1-0-1'Jerry Zhang