aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-10-30[automerger skipped] DO NOT MERGE - ↵r_aml_301500702android-mainline-12.0.0_r55android-mainline-11.0.0_r9android-mainline-11.0.0_r8android-mainline-11.0.0_r7android-mainline-11.0.0_r6android-mainline-11.0.0_r5android-mainline-11.0.0_r45android-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_r4android-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_r33android-mainline-11.0.0_r32android-mainline-11.0.0_r31android-mainline-11.0.0_r30android-mainline-11.0.0_r3android-mainline-11.0.0_r29android-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_r2android-mainline-11.0.0_r19android-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_r12android-mainline-11.0.0_r10android-mainline-11.0.0_r1android-11.0.0_r9android-11.0.0_r8android-11.0.0_r7android-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_r18android-11.0.0_r16android-11.0.0_r15android-11.0.0_r14android-11.0.0_r13android-11.0.0_r12android-11.0.0_r11android-11.0.0_r10android11-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-mainline-tethering-releaseandroid11-mainline-sparse-2021-jan-releaseandroid11-mainline-sparse-2020-dec-releaseandroid11-mainline-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-devandroid11-d2-releaseandroid11-d1-s7-releaseandroid11-d1-s6-releaseandroid11-d1-s5-releaseandroid11-d1-s1-releaseandroid11-d1-releaseandroid11-d1-b-releaseXin Li
qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master am: 65450e5be4 am: 0d22775e99 -s ours am skip reason: subject contains skip directive Change-Id: Ifbf421ee8a3e07f760e3311b36b67750fff2e21b
2019-10-30DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into ↵android-r-preview-4android-r-preview-3android-r-preview-2Xin Li
stage-aosp-master am: 65450e5be4 Change-Id: I26ef047ba9a503aa8c5ebe057e95954aaf33c396
2019-10-30DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into ↵android-r-preview-1Xin Li
stage-aosp-master Bug: 142003500 Change-Id: I2708a14e53513cbfb09c9272ccb478634bdad2ab
2019-09-08[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into ↵Xin Li
stage-aosp-master am: b0e3446028 -s ours am: bd6e32c578 -s ours am: 6a1367ef9e -s ours am skip reason: change_id I9d37ecefcc91ebab3bc798d0deed9e924ca828d3 with SHA1 9b99e6a8ea is in history Change-Id: Ib40a4a0ccc62bca1733a4855e6123def982ed210
2019-09-08[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into ↵Xin Li
stage-aosp-master am: b0e3446028 -s ours am: bd6e32c578 -s ours am skip reason: change_id I9d37ecefcc91ebab3bc798d0deed9e924ca828d3 with SHA1 9b99e6a8ea is in history Change-Id: Icef0efbb3fea71bc4060609783c414995c59b927
2019-09-08[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into ↵Xin Li
stage-aosp-master am: b0e3446028 -s ours am skip reason: change_id I9d37ecefcc91ebab3bc798d0deed9e924ca828d3 with SHA1 9b99e6a8ea is in history Change-Id: I4627986fb183fc78e9fdb2ef60ca6a0d334fb816
2019-09-08Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-masterXin Li
No content change. Bug: 135460123 Change-Id: Idb8d81be9d9877ab4796229229adfb52178f448b Merged-In: I9d37ecefcc91ebab3bc798d0deed9e924ca828d3
2019-09-05[automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master" am: ↵Xin Li
fcc17e5d0e -s ours am: 7b5e767755 am: be6af9bbc7 am: 46d10e2e12 -s ours am skip reason: subject contains skip directive Change-Id: Id1c118807011a076bb92a5ba585baaaaa0d90e32
2019-09-05[automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master" am: ↵Xin Li
fcc17e5d0e -s ours am: 7b5e767755 am: be6af9bbc7 Change-Id: Id43e2fc5dedb2cb3815e11ba2b3de4455a0e8270
2019-09-05[automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master" am: ↵Xin Li
fcc17e5d0e -s ours am: 7b5e767755 Change-Id: Ic137144bbf76eb74b450d85de7cc18c6045b039f
2019-09-05[automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master"Xin Li
am: fcc17e5d0e -s ours am skip reason: subject contains skip directive Change-Id: I0cb4b6eee32488906c931102709f17ccd8612521
2019-09-05Merge "DO NOT MERGE - Merge Android 10 into master"ndk-sysroot-r21Xin Li
2019-09-04DO NOT MERGE - Merge Android 10 into masterXin Li
Bug: 139893257 Change-Id: I9d37ecefcc91ebab3bc798d0deed9e924ca828d3
2019-07-02[automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor ↵Xin Li
(5699924) into stage-aosp-master am: 9206e29312 am: 3f2e666567 -s ours am skip reason: subject contains skip directive Change-Id: I3c0e4763b6eb841b59e16bbab88e586e0fd6e774
2019-07-02DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into ↵Xin Li
stage-aosp-master am: 9206e29312 Change-Id: I64079057c20c568597db0f9890121a8ae515754b
2019-07-01DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into ↵temp_140451723Xin Li
stage-aosp-master Bug: 134405016 Change-Id: I0757be296eead566bb474a2567e3d21d8203de23
2019-02-24[automerger skipped] DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-masterandroid-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-releaseXin Li
am: b48936b8eb -s ours am skip reason: subject contains skip directive Change-Id: If64cb26ca4690bb70f0d6775d3ab326f13c88fdc
2019-02-20DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-masterandroid-o-mr1-iot-release-1.0.14android-o-mr1-iot-release-1.0.13Xin Li
Bug: 120848293 Change-Id: Id7be988c7876ec0e8e236d5fbaf20830191898aa
2019-02-08tinycompress: tinycompress fixesAniket Kumar Lata
- Add get_metadata() and set_metadata() API support - Add support to send codec specific data Bug: 123065627 Test: make Change-Id: I9c3f39e22d7246fbb7cf665a4b5ce71a74e07495
2019-01-04Merge "Add default active developers into OWNERS" am: 8586332506 am: db355216b0Chih-hung Hsieh
am: ae5d1015f9 Change-Id: Icae6f0024ac71c926d7fb7b46bf7791256f743d1
2019-01-04Merge "Add default active developers into OWNERS" am: 8586332506Chih-hung Hsieh
am: db355216b0 Change-Id: Ideb8ab6ea0b4592f3f56324e49bfb9ec8cc076b8
2019-01-04Merge "Add default active developers into OWNERS"Chih-hung Hsieh
am: 8586332506 Change-Id: I1f893899bab0869215fc9f034ef988b9ee1cb454
2019-01-04Merge "Add default active developers into OWNERS"android-q-preview-6android-q-preview-5android-q-preview-4android-q-preview-2.5android-q-preview-1android-o-mr1-iot-release-1.0.8android-o-mr1-iot-release-1.0.12android-o-mr1-iot-release-1.0.10oreo-mr1-iot-releaseChih-hung Hsieh
2019-01-04Add default active developers into OWNERSChih-Hung Hsieh
Bug: 33166666 Test: gerrit uploader Change-Id: I76b9a3ac5a3f4d1440c5d210925e26afc0abc988
2018-12-10[automerger skipped] Merge "DO NOT MERGE" am: 4fddf72944 -s ours am: ↵Xin Li
8d475c5c23 -s ours am: af190ff1eb -s ours Change-Id: I705e4d182e59d5a86091637def1b39e377595bfb
2018-12-10[automerger skipped] Merge "DO NOT MERGE" am: 4fddf72944 -s oursXin Li
am: 8d475c5c23 -s ours Change-Id: I5aa18da3474d95247496ca7278b277617fed0a53
2018-12-10[automerger skipped] Merge "DO NOT MERGE"Xin Li
am: 4fddf72944 -s ours Change-Id: I620a71c35f6b2291a9a152d3cbb1ccd4395f9b66
2018-12-10Merge "DO NOT MERGE"android-o-mr1-iot-release-1.0.7Treehugger Robot
2018-12-07DO NOT MERGEXin Li
Merge pie-platform-release (PPRL.181205.001, history only) into master Bug: 120502534 Change-Id: I66a5886cb435e0856646a8761d59bf798c078863
2017-10-13Snap for 4393550 from 67eecda8d99419fab4482154a5e6b572f33dc80b to pi-releaseandroid-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-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-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-releaseandroid-build-team Robot
Change-Id: Ia5328d0231bb4d1e9349dcc768283043a340e2cc
2017-10-12Merge "Use -Werror in external/tinycompress" am: e7d3077126 am: 5e02fdc8eb ↵android-wear-8.0.0_r2android-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.5android-o-mr1-iot-release-1.0.4android-o-mr1-iot-release-1.0.3android-n-iot-release-ihome-igv1android-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-devoreo-mr1-1.2-iot-releasenougat-iot-releasemaster-cuttlefish-testing-releaseChih-hung Hsieh
am: 69d5d66bd6 am: 1926c2138d Change-Id: Ic5ffa674cf740a0f29997281d469bf067f3bc814
2017-10-12Merge "Use -Werror in external/tinycompress" am: e7d3077126 am: 5e02fdc8ebandroid-wear-p-preview-2android-wear-8.0.0_r1android-p-preview-5android-p-preview-4android-p-preview-3android-p-preview-2android-p-preview-1android-o-mr1-iot-release-1.0.2android-o-mr1-iot-release-1.0.1android-o-mr1-iot-release-1.0.0android-o-mr1-iot-preview-8android-o-mr1-iot-preview-7android-n-iot-release-smart-display-r2android-n-iot-release-smart-displayandroid-n-iot-release-polk-at1android-n-iot-release-lg-thinq-wk7o-mr1-iot-preview-8o-mr1-iot-preview-7Chih-hung Hsieh
am: 69d5d66bd6 Change-Id: Ied3ba388c2be68fbb46e33684a4603d025c5ae15
2017-10-12Merge "Use -Werror in external/tinycompress" am: e7d3077126Chih-hung Hsieh
am: 5e02fdc8eb Change-Id: Id2f4d72bbf40acddf774f44bc1a4f465c9dc2db6
2017-10-12Merge "Use -Werror in external/tinycompress"android-o-mr1-iot-preview-6o-mr1-iot-preview-6Chih-hung Hsieh
am: e7d3077126 Change-Id: Ib37cfaa4080019c518ab1a0d7841bf613ad0ed2b
2017-10-12Merge "Use -Werror in external/tinycompress"Chih-hung Hsieh
2017-09-29Use -Werror in external/tinycompressChih-Hung Hsieh
* Suppress non-critical warnings. Bug: 66996870 Test: build with WITH_TIDY=1 Change-Id: Id0a4f4431f8420dbbe20ec541aa3be6a77567b7c
2017-07-12Merge "libtinycompress: Android.mk -> Android.bp" am: 6ded547e25 am: ↵oreo-mr1-devSteven Moreland
846573ce25 am: a1e6f4979c am: c189c3fded Change-Id: I8bc4ec8dbfc6e12940e19f95d20ed270763fa22f
2017-07-12Merge "libtinycompress: Android.mk -> Android.bp" am: 6ded547e25 am: 846573ce25Steven Moreland
am: a1e6f4979c Change-Id: Icc5954eb6620d49e6ca6a8b888e12477c2108478
2017-07-12Merge "libtinycompress: Android.mk -> Android.bp" am: 6ded547e25Steven Moreland
am: 846573ce25 Change-Id: Ifd65522bfd9de6f7597bcc33b7699a263c13a6fb
2017-07-12Merge "libtinycompress: Android.mk -> Android.bp"android-o-mr1-preview-2android-o-mr1-preview-1Steven Moreland
am: 6ded547e25 Change-Id: I7ae3756f62ddf4577ed52b48f50fd4a5c3531377
2017-07-12Merge "libtinycompress: Android.mk -> Android.bp"android-o-preview-4android-o-iot-preview-5o-iot-preview-5Treehugger Robot
2017-07-12libtinycompress: Android.mk -> Android.bpSteven Moreland
device-specific kernel headers are referenced via the new device_kernel_headers module. Test: links Bug: 37512442 Bug: 38117654 Change-Id: I2880e0250460ca506386ebd89dc808b526e6935f
2017-07-11Merge "Move cplay to vendor." am: c85b75c41e am: 69470a8bd8 am: a6b05e6543Steven Moreland
am: 0aa94d40d1 -s ours Change-Id: I388dec64e4d49bc67d97b3d58dea836c733109ea
2017-07-11Merge "Move cplay to vendor." am: c85b75c41e am: 69470a8bd8Steven Moreland
am: a6b05e6543 Change-Id: I440b059268b5249627cba2daa18eb331296034b7
2017-07-11Merge "Move cplay to vendor." am: c85b75c41eSteven Moreland
am: 69470a8bd8 Change-Id: I8f2caad10fc02fdb52b6bcfa16440d3c7309b94c
2017-07-11Merge "Move cplay to vendor."Steven Moreland
am: c85b75c41e Change-Id: I9791826235e76bff25cdb497e324ae8210bc3d4d
2017-07-11Merge "Move cplay to vendor."Treehugger Robot
2017-07-11Move cplay to vendor.Steven Moreland
cplay is using libtinycompress which is a vendor only module. Test: CleanSpec works Test: with BOARD_VNDK_VERSION Test: hitting "Error: Can't find sync word" with and without this change (filed b/63141137) Bug: 37342627 Merged-In: Id50dd55b772e44d1aa7427caa7338d5096c9e862 Change-Id: Id50dd55b772e44d1aa7427caa7338d5096c9e862
2017-06-29Move cplay to vendor.Steven Moreland
cplay is using libtinycompress which is a vendor only module. Test: CleanSpec works Test: with BOARD_VNDK_VERSION Test: hitting "Error: Can't find sync word" with and without this change (filed b/63141137) Bug: 37342627 Change-Id: Id50dd55b772e44d1aa7427caa7338d5096c9e862
2017-05-17Move libtinycompress to vendor partition am: e446d85daf -s oursoreo-dr1-devVijay Venkatraman
am: 0e79f98cf5 -s ours Change-Id: Ib34e16902b7d2cfc6475b23c8222a4f63fefa6ef
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-19 13:40:38 +0000