summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge Android 12HEADmasterXin Li2021-10-067-53/+84
|\
| * Merge sc-dev-plus-aosp-without-vendor@7634622Xin Li2021-08-147-53/+84
| |\
| | * [automerger skipped] Merge "Convert tests/Android.mk to Android.bp" am: e365a...Yuntao Xu2021-06-280-0/+0
| | |\ | | |/ | |/|
| * | Merge "Convert tests/Android.mk to Android.bp" am: e365ae93b1Yuntao Xu2021-06-282-16/+19
| |\ \ | |/ / |/| |
* | | Merge "Convert tests/Android.mk to Android.bp"android-s-beta-5android-s-beta-4android-s-beta-3android-s-beta-5android-s-beta-4Yuntao Xu2021-06-282-16/+19
|\ \ \ | |/ / |/| |
| * | Convert tests/Android.mk to Android.bpYuntao Xu2021-04-292-16/+19
| | * MTP: Skip runtime thumbnail generation for Android Host am: e265268ad8James Wei2021-06-231-0/+28
| | |\
| | | * MTP: Skip runtime thumbnail generation for Android Hostandroid12-devJames Wei2021-06-211-0/+28
| | * | [automerger skipped] Convert perf_tests/Android.mk to Android.bp am: 9502a0d6...Yuntao Xu2021-05-210-0/+0
| | |\ \ | |_|/ / |/| | / | | |/
* | | Convert perf_tests/Android.mk to Android.bp am: 9502a0d62cYuntao Xu2021-05-212-15/+14
|\ \ \
| * | | Convert perf_tests/Android.mk to Android.bpYuntao Xu2021-04-292-15/+14
| |/ /
| | * [automerger skipped] [LSC] Add LOCAL_LICENSE_KINDS to packages/services/Mtp a...Bob Badour2021-04-210-0/+0
| | |\
| | | * [LSC] Add LOCAL_LICENSE_KINDS to packages/services/Mtp am: 238bd31090 am: 906...Bob Badour2021-04-212-0/+4
| | | |\ | |_|_|/ |/| | |
* | | | [LSC] Add LOCAL_LICENSE_KINDS to packages/services/Mtp am: 238bd31090Bob Badour2021-04-212-0/+4
|\| | |
| * | | [LSC] Add LOCAL_LICENSE_KINDS to packages/services/Mtpandroid-s-beta-2android-s-beta-1Bob Badour2021-04-212-0/+4
|/ / /
| * | [LSC] Add LOCAL_LICENSE_KINDS to packages/services/MtpBob Badour2021-03-012-0/+8
| * | [automerger skipped] Mark ab/7061308 as merged in stage. am: 08efe8840d -s ou...Xin Li2021-02-210-0/+0
| |\|
| | * [automerger skipped] Mark ab/7061308 as merged in stage. am: 08efe8840d -s oursXin Li2021-02-200-0/+0
| | |\ | |_|/ |/| |
* | | Mark ab/7061308 as merged in stage.Xin Li2021-02-200-0/+0
|\ \ \
| | * | [LSC] Add LOCAL_LICENSE_KINDS to packages/services/Mtp am: 3279257675 am: ec0...Bob Badour2021-02-211-0/+4
| | |\|
| | | * [LSC] Add LOCAL_LICENSE_KINDS to packages/services/Mtp am: 3279257675 am: ec0...Bob Badour2021-02-191-0/+4
| | |/| | |/|/ | |/| |/| |
* | | [LSC] Add LOCAL_LICENSE_KINDS to packages/services/Mtp am: 3279257675Bob Badour2021-02-191-0/+4
|\ \ \
| * | | [LSC] Add LOCAL_LICENSE_KINDS to packages/services/MtpBob Badour2021-02-121-0/+4
|/ / /
| | * Mark ab/6881855 as merged am: fa405a436a am: 1361c744d7Xin Li2020-11-240-0/+0
| | |\ | | |/ | |/|
| * | Mark ab/6881855 as merged am: fa405a436aXin Li2020-11-240-0/+0
| |\ \ | |/ / |/| |
* | | Mark ab/6881855 as mergedandroid-s-preview-1Xin Li2020-11-230-0/+0
|\ \ \
| | | * can't access external storage in ptp mode am: 2c959b7e36 am: 2d7dc8f70e am: 7...joker.yang2020-11-061-6/+2
| | | |\ | | | |/ | | |/|
| | * | can't access external storage in ptp mode am: 2c959b7e36 am: 2d7dc8f70e am: 7...joker.yang2020-11-061-6/+2
| |/| |
| | * | can't access external storage in ptp mode am: 2c959b7e36 am: 2d7dc8f70ejoker.yang2020-11-061-6/+2
| | |\ \ | |_|/ / |/| | |
* | | | can't access external storage in ptp mode am: 2c959b7e36joker.yang2020-11-061-6/+2
|\ \ \ \ | |_|/ / |/| | |
| * | | can't access external storage in ptp modejoker.yang2020-11-061-6/+2
|/ / /
| | * Convert {tests,perf_tests}/Android.mk files to Android.bpSasha Smundak2020-06-036-32/+29
| | * Add an exported flag in manifestAshwini Oruganti2020-05-282-46/+50
| | * MTP: Add MTP host exception handling#2 am: e0297ce1af am: 073d5efa7c am: 8788...James Wei2020-04-070-0/+0
| | |\ | | |/ | |/|
| * | MTP: Add MTP host exception handling#2 am: e0297ce1af am: 073d5efa7c am: 8788...James Wei2020-04-070-0/+0
| |\ \
| | * \ MTP: Add MTP host exception handling#2 am: e0297ce1af am: 073d5efa7c am: 8788...James Wei2020-04-072-1/+15
| | |\ \
| | | * \ MTP: Add MTP host exception handling#2 am: e0297ce1af am: 073d5efa7candroid-11.0.0_r48android-11.0.0_r47android-11.0.0_r46android-11.0.0_r45android-11.0.0_r44android-11.0.0_r43android-11.0.0_r42android-11.0.0_r41android-11.0.0_r40android-11.0.0_r39android-11.0.0_r38android-11.0.0_r37android-11.0.0_r36android-11.0.0_r35android-11.0.0_r34android-11.0.0_r33android-11.0.0_r32android-11.0.0_r31android-11.0.0_r30android-11.0.0_r29android-11.0.0_r28android-11.0.0_r27android-11.0.0_r26android-11.0.0_r24android-11.0.0_r23android-11.0.0_r22android-11.0.0_r21android-11.0.0_r20android-11.0.0_r19android-11.0.0_r18android11-qpr3-s1-releaseandroid11-qpr3-releaseandroid11-qpr2-releaseandroid11-qpr1-s2-releaseandroid11-qpr1-s1-releaseandroid11-qpr1-releaseandroid11-qpr1-d-s1-releaseandroid11-qpr1-d-releaseandroid11-qpr1-c-releaseandroid11-d2-releaseJames Wei2020-04-072-1/+15
| | | |\ \
| | | | | * MTP: Add MTP host exception handling#2 am: e0297ce1af am: 2ad695e9d8 am: 91d4...James Wei2020-04-070-0/+0
| | | | | |\ | | |_|_|_|/ | |/| | | |
| * | | | | MTP: Add MTP host exception handling#2 am: e0297ce1af am: 2ad695e9d8 am: 91d4...James Wei2020-04-070-0/+0
| |\ \ \ \ \ | |/ / / / / |/| | | | |
* | | | | | MTP: Add MTP host exception handling#2 am: e0297ce1af am: 2ad695e9d8James Wei2020-04-070-0/+0
|\ \ \ \ \ \
| * \ \ \ \ \ MTP: Add MTP host exception handling#2 am: e0297ce1afplatform-tools-30.0.5James Wei2020-04-072-1/+15
| |\ \ \ \ \ \
| | | | | | | * MTP: Add MTP host exception handling#2 am: e0297ce1af am: 073d5efa7c am: 631b...James Wei2020-04-072-1/+15
| | | | | | | |\ | | | | |_|_|_|/ | | | |/| | | |
| | | * | | | | MTP: Add MTP host exception handling#2 am: e0297ce1af am: 073d5efa7c am: 631b...James Wei2020-04-072-1/+15
| | | |\ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
* | | | | | | | MTP: Add MTP host exception handling#2 am: e0297ce1af am: 073d5efa7cJames Wei2020-04-072-1/+15
|\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | |
| * | | | | | | MTP: Add MTP host exception handling#2 am: e0297ce1afandroid-11.0.0_r16android11-d1-b-releaseJames Wei2020-04-072-1/+15
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | * | | | | | MTP: Add MTP host exception handling#2android-mainline-11.0.0_r44android-mainline-11.0.0_r43android-mainline-11.0.0_r42android-mainline-11.0.0_r41android-mainline-11.0.0_r40android-mainline-11.0.0_r39android-mainline-11.0.0_r38android-mainline-11.0.0_r37android-mainline-11.0.0_r36android-mainline-11.0.0_r35android-mainline-11.0.0_r34android-mainline-11.0.0_r32android-mainline-11.0.0_r31android-mainline-11.0.0_r30android-mainline-11.0.0_r28android-mainline-11.0.0_r27android-mainline-11.0.0_r26android-mainline-11.0.0_r25android-mainline-11.0.0_r24android-mainline-11.0.0_r23android-mainline-11.0.0_r22android-mainline-11.0.0_r21android-mainline-11.0.0_r20android-mainline-11.0.0_r18android-mainline-11.0.0_r17android-mainline-11.0.0_r16android-mainline-11.0.0_r15android-mainline-11.0.0_r14android-mainline-11.0.0_r13android-mainline-11.0.0_r12android11-mainline-tethering-releaseandroid11-mainline-permission-releaseandroid11-mainline-os-statsd-releaseandroid11-mainline-networkstack-releaseandroid11-mainline-media-swcodec-releaseandroid11-mainline-media-releaseandroid11-mainline-extservices-releaseandroid11-mainline-documentsui-releaseandroid11-mainline-conscrypt-releaseandroid11-mainline-cellbroadcast-releaseandroid11-mainline-captiveportallogin-releaseandroid11-devJames Wei2020-04-012-1/+15
| | | | | | | * MTP: Add MTP host exception handling am: 15486968c2 am: d54889408a am: 826c03...James Wei2020-03-240-0/+0
| | | | | | | |\ | | | | | |_|_|/ | | | | |/| | |
| | | | * | | | MTP: Add MTP host exception handling am: 15486968c2 am: d54889408a am: 826c03...James Wei2020-03-240-0/+0
| | | | |\| | |
| | | | | * | | MTP: Add MTP host exception handling am: 15486968c2 am: d54889408a am: 826c03...James Wei2020-03-242-0/+11
| | | | | |\| |
| | | | | | * | MTP: Add MTP host exception handling am: 15486968c2 am: d54889408aJames Wei2020-03-242-0/+11
| | | | | |/| | | | |_|_|_|/ / | |/| | | | |