aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-10-12Upgrade xz-embedded to 3f438e15109229bb14ab45f285f4bff5412a9542 am: ↵t_frc_odp_330442040t_frc_odp_330442000t_frc_con_330443020t_frc_cbr_330443000t_frc_ase_330444010t_frc_art_330443060t_frc_adb_330444000frc_340821000frc_340819280frc_340819220frc_340819190frc_340819030frc_340819020frc_340819010frc_340818170frc_340818110android-vts-14.0_r4android-vts-14.0_r3android-vts-14.0_r2android-vts-14.0_r1android-u-beta-1-gplandroid-security-14.0.0_r8android-security-14.0.0_r7android-security-14.0.0_r6android-security-14.0.0_r5android-security-14.0.0_r4android-security-14.0.0_r3android-security-14.0.0_r2android-security-14.0.0_r1android-platform-14.0.0_r7android-platform-14.0.0_r6android-platform-14.0.0_r5android-platform-14.0.0_r4android-platform-14.0.0_r3android-platform-14.0.0_r2android-platform-14.0.0_r1android-cts-14.0_r4android-cts-14.0_r3android-cts-14.0_r2android-cts-14.0_r1android-14.0.0_r9android-14.0.0_r8android-14.0.0_r7android-14.0.0_r6android-14.0.0_r5android-14.0.0_r45android-14.0.0_r44android-14.0.0_r43android-14.0.0_r42android-14.0.0_r41android-14.0.0_r40android-14.0.0_r4android-14.0.0_r39android-14.0.0_r38android-14.0.0_r3android-14.0.0_r28android-14.0.0_r27android-14.0.0_r26android-14.0.0_r25android-14.0.0_r24android-14.0.0_r23android-14.0.0_r22android-14.0.0_r21android-14.0.0_r20android-14.0.0_r2android-14.0.0_r19android-14.0.0_r18android-14.0.0_r17android-14.0.0_r16android-14.0.0_r15android-14.0.0_r14android-14.0.0_r13android-14.0.0_r12android-14.0.0_r11android-14.0.0_r10android-14.0.0_r1android-13.0.0_r83android-13.0.0_r82android-13.0.0_r81android-13.0.0_r80android-13.0.0_r79android-13.0.0_r78android-13.0.0_r77android-13.0.0_r76android-13.0.0_r75android-13.0.0_r74android-13.0.0_r73android-13.0.0_r72android-13.0.0_r71android-13.0.0_r70android-13.0.0_r69android-13.0.0_r68android-13.0.0_r67android-13.0.0_r66android-13.0.0_r65android-13.0.0_r64android-13.0.0_r63android-13.0.0_r62android-13.0.0_r61android-13.0.0_r60android-13.0.0_r59android-13.0.0_r58android-13.0.0_r57android-13.0.0_r56android-13.0.0_r55android-13.0.0_r54android-13.0.0_r53android-13.0.0_r52android-13.0.0_r51android-13.0.0_r50android-13.0.0_r49android-13.0.0_r48android-13.0.0_r47android-13.0.0_r46android-13.0.0_r45android-13.0.0_r44android-13.0.0_r43android-13.0.0_r42android-13.0.0_r41android-13.0.0_r40android-13.0.0_r39android-13.0.0_r38android-13.0.0_r37android-13.0.0_r36android-13.0.0_r35android-13.0.0_r34android-13.0.0_r33android-13.0.0_r32android-13.0.0_r30android-13.0.0_r29android-13.0.0_r28android-13.0.0_r27android-13.0.0_r24android-13.0.0_r23android-13.0.0_r22android-13.0.0_r21android-13.0.0_r20android-13.0.0_r19android-13.0.0_r18android-13.0.0_r17android-13.0.0_r16aml_uwb_341513070aml_uwb_341511050aml_uwb_341310300aml_uwb_341310030aml_uwb_341111010aml_uwb_341011000aml_uwb_331910010aml_uwb_331820070aml_uwb_331613010aml_uwb_331611010aml_uwb_331410010aml_uwb_331310030aml_uwb_331115000aml_uwb_331015040aml_uwb_330810010aml_tz5_341510070aml_tz5_341510050aml_tz5_341510010aml_tz4_332714070aml_tz4_332714050aml_tz4_332714010aml_tz4_331910000aml_tz4_331314030aml_tz4_331314020aml_tz4_331314010aml_tz4_331012050aml_tz4_331012040aml_tz4_331012000aml_rkp_341510000aml_rkp_341311000aml_rkp_341114000aml_rkp_341015010aml_rkp_341012000aml_odp_341610000aml_hef_341613000aml_hef_341512030aml_hef_341415040aml_hef_341311010aml_hef_341114030aml_go_wif_330911000aml_go_uwb_330912000aml_go_tz4_330912000aml_go_tet_330914010aml_go_swc_330913000aml_go_sta_330911000aml_go_sdk_330810000aml_go_sch_330911000aml_go_res_330912000aml_go_per_330912000aml_go_odp_330913000aml_go_odp_330912000aml_go_neu_330912000aml_go_net_330913000aml_go_mpr_330912000aml_go_ase_330913000aml_go_ads_330915100aml_go_ads_330915000aml_go_ads_330913000aml_go_adb_330913000aml_cfg_341510000aml_ase_341510000aml_ase_341410000aml_ase_341310010aml_ase_341113000aml_ase_340913000aml_ase_331311020aml_ase_331112000aml_ase_331011020aml_ads_341615050aml_ads_341517040aml_ads_341413000aml_ads_341316030aml_ads_341131050aml_ads_341027030aml_ads_340915050aml_ads_331920180aml_ads_331814200aml_ads_331710270aml_ads_331611190aml_ads_331511020aml_ads_331418080aml_ads_331131000main-16k-with-phonesmain-16kandroid14-tests-releaseandroid14-security-releaseandroid14-s2-releaseandroid14-s1-releaseandroid14-releaseandroid14-qpr1-s2-releaseandroid14-qpr1-releaseandroid14-platform-releaseandroid14-mainline-uwb-releaseandroid14-mainline-healthfitness-releaseandroid14-mainline-appsearch-releaseandroid14-mainline-adservices-releaseandroid14-gsiandroid14-devandroid14-d2-s5-releaseandroid14-d2-s4-releaseandroid14-d2-s3-releaseandroid14-d2-s2-releaseandroid14-d2-s1-releaseandroid14-d2-releaseandroid14-d1-s7-releaseandroid14-d1-s6-releaseandroid14-d1-s5-releaseandroid14-d1-s4-releaseandroid14-d1-s3-releaseandroid14-d1-s2-releaseandroid14-d1-s1-releaseandroid14-d1-releaseandroid13-qpr3-s9-releaseandroid13-qpr3-s8-releaseandroid13-qpr3-s7-releaseandroid13-qpr3-s6-releaseandroid13-qpr3-s5-releaseandroid13-qpr3-s4-releaseandroid13-qpr3-s3-releaseandroid13-qpr3-s2-releaseandroid13-qpr3-s14-releaseandroid13-qpr3-s13-releaseandroid13-qpr3-s12-releaseandroid13-qpr3-s11-releaseandroid13-qpr3-s10-releaseandroid13-qpr3-s1-releaseandroid13-qpr3-releaseandroid13-qpr3-c-s8-releaseandroid13-qpr3-c-s7-releaseandroid13-qpr3-c-s6-releaseandroid13-qpr3-c-s5-releaseandroid13-qpr3-c-s4-releaseandroid13-qpr3-c-s3-releaseandroid13-qpr3-c-s2-releaseandroid13-qpr3-c-s12-releaseandroid13-qpr3-c-s11-releaseandroid13-qpr3-c-s10-releaseandroid13-qpr3-c-s1-releaseandroid13-qpr2-s9-releaseandroid13-qpr2-s8-releaseandroid13-qpr2-s7-releaseandroid13-qpr2-s6-releaseandroid13-qpr2-s5-releaseandroid13-qpr2-s3-releaseandroid13-qpr2-s2-releaseandroid13-qpr2-s12-releaseandroid13-qpr2-s11-releaseandroid13-qpr2-s10-releaseandroid13-qpr2-s1-releaseandroid13-qpr2-releaseandroid13-qpr2-b-s1-releaseandroid13-qpr1-s8-releaseandroid13-qpr1-s7-releaseandroid13-qpr1-s6-releaseandroid13-qpr1-s5-releaseandroid13-qpr1-s4-releaseandroid13-qpr1-s3-releaseandroid13-qpr1-s2-releaseandroid13-qpr1-s1-releaseandroid13-qpr1-releaseandroid13-mainline-uwb-releaseandroid13-mainline-tzdata4-releaseandroid13-mainline-go-wifi-releaseandroid13-mainline-go-uwb-releaseandroid13-mainline-go-tzdata4-releaseandroid13-mainline-go-tethering-releaseandroid13-mainline-go-sdkext-releaseandroid13-mainline-go-scheduling-releaseandroid13-mainline-go-resolv-releaseandroid13-mainline-go-permission-releaseandroid13-mainline-go-os-statsd-releaseandroid13-mainline-go-odp-releaseandroid13-mainline-go-neuralnetworks-releaseandroid13-mainline-go-networking-releaseandroid13-mainline-go-mediaprovider-releaseandroid13-mainline-go-media-swcodec-releaseandroid13-mainline-go-appsearch-releaseandroid13-mainline-go-adservices-releaseandroid13-mainline-go-adbd-releaseandroid13-mainline-appsearch-releaseandroid13-mainline-adservices-releaseandroid13-frc-odp-releaseandroid13-frc-conscrypt-releaseandroid13-frc-cellbroadcast-releaseandroid13-frc-art-releaseandroid13-frc-adbd-releaseandroid13-devandroid13-d4-s2-releaseandroid13-d4-s1-releaseandroid13-d4-releaseandroid13-d3-s1-releaseandroid13-d2-releaseaml_tz5_341510010aml_tz4_332714010Elliott Hughes
6e6257f536 am: b7e6cc6d06 am: 4e070e07ba am: e0f55df487 am: 693018d723 Original change: https://android-review.googlesource.com/c/platform/external/xz-embedded/+/1853701 Change-Id: Id20eca8045d709b60b2d5ac59a1800b57d6bd3f9
2021-10-12Upgrade xz-embedded to 3f438e15109229bb14ab45f285f4bff5412a9542 am: ↵Elliott Hughes
6e6257f536 am: b7e6cc6d06 am: 4e070e07ba am: e0f55df487 Original change: https://android-review.googlesource.com/c/platform/external/xz-embedded/+/1853701 Change-Id: I764132b22c8050c884319198e547e38293537abd
2021-10-12Upgrade xz-embedded to 3f438e15109229bb14ab45f285f4bff5412a9542 am: ↵android-t-preview-2android-t-preview-1android-t-beta-3android-s-v2-beta-3android-s-qpr3-beta-1android-t-preview-1android-s-v2-beta-3android-s-qpr3-beta-1Elliott Hughes
6e6257f536 am: b7e6cc6d06 am: 4e070e07ba Original change: https://android-review.googlesource.com/c/platform/external/xz-embedded/+/1853701 Change-Id: I48ebef3fdf873ff232816fe842d4665f6a52ee89
2021-10-12Upgrade xz-embedded to 3f438e15109229bb14ab45f285f4bff5412a9542 am: ↵Elliott Hughes
6e6257f536 am: b7e6cc6d06 Original change: https://android-review.googlesource.com/c/platform/external/xz-embedded/+/1853701 Change-Id: I681d7d5fb3faee554fec2910eb5e28ebaa05195c
2021-10-12Upgrade xz-embedded to 3f438e15109229bb14ab45f285f4bff5412a9542 am: 6e6257f536Elliott Hughes
Original change: https://android-review.googlesource.com/c/platform/external/xz-embedded/+/1853701 Change-Id: I3cd0c179e6fe0c955fc945543c2255d6ca16ad61
2021-10-11Upgrade xz-embedded to 3f438e15109229bb14ab45f285f4bff5412a9542android-s-v2-preview-2android-s-v2-preview-1android-s-v2-beta-2android-s-v2-preview-1Elliott Hughes
Test: make Change-Id: I7eb36c456de507dfb5f0501714ef54a4c274cf1a
2021-10-06Merge "Add METADATA." am: 8c1499921e am: dda1bf761e am: 5da4ef0d61 am: ↵Treehugger Robot
17076e534d am: 17738d50c9 Original change: https://android-review.googlesource.com/c/platform/external/xz-embedded/+/1844021 Change-Id: Ic7cffd1f13b598be37eabbabd67d74b0aa63a2c9
2021-10-06Merge "Add METADATA." am: 8c1499921e am: dda1bf761e am: 5da4ef0d61 am: ↵Treehugger Robot
17076e534d Original change: https://android-review.googlesource.com/c/platform/external/xz-embedded/+/1844021 Change-Id: I77326695da5f90ffa114bd09325f909e75025984
2021-10-06Merge "Add METADATA." am: 8c1499921e am: dda1bf761e am: 5da4ef0d61Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/xz-embedded/+/1844021 Change-Id: I1b4f853034c092be2c590a6edeee49fb1b273f69
2021-10-06Merge "Add METADATA." am: 8c1499921e am: dda1bf761eTreehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/xz-embedded/+/1844021 Change-Id: Ia8cf1d719cd785a18c584deffeab294fa3210e4c
2021-10-06Merge "Add METADATA." am: 8c1499921eTreehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/xz-embedded/+/1844021 Change-Id: I81e227e96a67fd7431915659d5de85c44298e84e
2021-10-06Merge "Add METADATA."Treehugger Robot
2021-10-04Add METADATA.Elliott Hughes
Bug: http://b/184301514 Test: N/A Change-Id: Ia1d1ef3a97cd72be5190a9283574017c241dfcbe
2021-09-19Fix spelling in comments.Lasse Collin
non-splitted -> non-split uncompressible -> incompressible
2021-09-19Fix typos in comments.Lasse Collin
I happened to find these from the Linux source tree.
2021-09-19Add MicroLZMA decoder.Lasse Collin
MicroLZMA is a yet another header format variant where the first byte of a raw LZMA stream (without the end of stream marker) has been replaced with a bitwise-negation of the lc/lp/pb properties byte. MicroLZMA was created to be used in EROFS but can be used by other things too where wasting minimal amount of space for headers is important. This is implemented using most of the LZMA2 code as is so the amount of new code is small. The API has a few extra features compared to the XZ decoder. On the other hand, the API lacks XZ_BUF_ERROR support which is important to take into account when using this API. MicroLZMA doesn't support BCJ filters. In theory they could be added later as there are many unused/reserved values for the first byte of the compressed stream but in practice it is somewhat unlikely to happen due to a few implementation reasons. Thanks to Gao Xiang (EROFS developer) for testing and feedback.
2021-07-02Validate the value before, not after, assigning it to an enum variable.Lasse Collin
This might matter, for example, if the underlying type of enum xz_check was a signed char. In such a case the validation wouldn't catch an unsupported header. With most compilers it already worked correctly but it's better to change it for portability and conformance. This may increase the code size by a few bytes though. An alternative would be to use an unsigned int instead of enum xz_check but using an enumeration looks cleaner.
2021-06-20Move s->lzma.len = 0 initialization to lzma_reset().Lasse Collin
It's a more logical place even if the resetting needs to be done only once per LZMA2 stream (if lzma_reset() called in the middle of an LZMA2 stream, .len will already be 0).
2021-06-20Fix a typo in a comment.Lasse Collin
2021-06-02Merge sc-mainline-prodXin Li
Bug: 189946434 Change-Id: I9e9cff9005bd2acb5ea646eb37492500fefa69ba
2021-05-06Add xz_dec_catrun() to support concatenated .xz files.Lasse Collin
2021-02-16[LSC] Add LOCAL_LICENSE_KINDS to external/xz-embedded am: 7810596cd0 am: ↵android-mainline-12.0.0_r99android-mainline-12.0.0_r98android-mainline-12.0.0_r77android-mainline-12.0.0_r70android-mainline-12.0.0_r69android-mainline-12.0.0_r63android-mainline-12.0.0_r59android-mainline-12.0.0_r56android-mainline-12.0.0_r5android-mainline-12.0.0_r49android-mainline-12.0.0_r42android-mainline-12.0.0_r39android-mainline-12.0.0_r22android-mainline-12.0.0_r19android-mainline-12.0.0_r122android-mainline-12.0.0_r115android-mainline-12.0.0_r113android-mainline-12.0.0_r100aml_tz3_311312010android12-mainline-networkstack-releaseandroid12-mainline-art-releaseBob Badour
e391d63e86 am: 2dcc8c1d1b am: 6bfb1849ec Original change: https://android-review.googlesource.com/c/platform/external/xz-embedded/+/1588642 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I1e4827ffad528ba05aa38db59f0bef314e6faabb
2021-02-16[LSC] Add LOCAL_LICENSE_KINDS to external/xz-embedded am: 7810596cd0 am: ↵Bob Badour
e391d63e86 am: 2dcc8c1d1b am: 6bfb1849ec Original change: https://android-review.googlesource.com/c/platform/external/xz-embedded/+/1588642 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I36848833c3c11e0be069e81f16cc88f29ef89b4e
2021-02-16[LSC] Add LOCAL_LICENSE_KINDS to external/xz-embedded am: 7810596cd0 am: ↵android-mainline-12.0.0_r4android-mainline-12.0.0_r36android-12.1.0_r9android-12.1.0_r8android-12.1.0_r7android-12.1.0_r26android-12.1.0_r25android-12.1.0_r24android-12.1.0_r23android-12.1.0_r22android-12.1.0_r21android-12.1.0_r20android-12.1.0_r19android-12.1.0_r18android-12.1.0_r17android-12.1.0_r16android-12.1.0_r15android-12.1.0_r14android-12.1.0_r13android-12.1.0_r12android-12.1.0_r11android-12.1.0_r10android-12.0.0_r32android-12.0.0_r29android-12.0.0_r28android-12.0.0_r27android-12.0.0_r26android-12.0.0_r21android-12.0.0_r20android-12.0.0_r19android-12.0.0_r18android-12.0.0_r16android12L-devandroid12L-d2-s8-releaseandroid12L-d2-s7-releaseandroid12L-d2-s6-releaseandroid12L-d2-s5-releaseandroid12L-d2-s4-releaseandroid12L-d2-s3-releaseandroid12L-d2-s2-releaseandroid12L-d2-s1-releaseandroid12L-d2-releaseandroid12-qpr3-s7-releaseandroid12-qpr3-s6-releaseandroid12-qpr3-s5-releaseandroid12-qpr3-s4-releaseandroid12-qpr3-s3-releaseandroid12-qpr3-s2-releaseandroid12-qpr3-s1-releaseandroid12-qpr3-releaseandroid12-qpr1-releaseandroid12-qpr1-d-s3-releaseandroid12-qpr1-d-s2-releaseandroid12-qpr1-d-s1-releaseandroid12-qpr1-d-releaseandroid12-devandroid12--mainline-releaseBob Badour
e391d63e86 am: 2dcc8c1d1b Original change: https://android-review.googlesource.com/c/platform/external/xz-embedded/+/1588642 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: If380ba12f715e36d5d90cf2873d7e4229b8293f8
2021-02-16[LSC] Add LOCAL_LICENSE_KINDS to external/xz-embedded am: 7810596cd0 am: ↵Bob Badour
e391d63e86 Original change: https://android-review.googlesource.com/c/platform/external/xz-embedded/+/1588642 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I25c642ae0825edd03a5fd3d863fc5e247875ec0e
2021-02-16[LSC] Add LOCAL_LICENSE_KINDS to external/xz-embedded am: 7810596cd0android-s-beta-5android-s-beta-4android-s-beta-3android-s-beta-2android-s-beta-1android-s-beta-5android-s-beta-4Bob Badour
Original change: https://android-review.googlesource.com/c/platform/external/xz-embedded/+/1588642 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I35dae3323ae5236df71b5e46a4c6fcd4459fcc18
2021-02-15userspace/Makefile: Add a comment about -std=gnu89 and add -Wno-long-long.Lasse Collin
gcc -std=gnu89 -pedantic warns about the ULL integer constant suffix in xz_crc64.c so silence it with -Wno-long-long. clang -std=gnu89 -pedantic is noisy about C99 features and language extensions. Omitting either option silences all these warnings, so mention this in a comment.
2021-02-15Make xz_crc64.c compatible with -std=gnu89 on 32-bit platforms.Lasse Collin
When "unsigned long" is 32 bits and GCC or Clang is in gnu89 mode, the 64-bit constant doesn't become "unsigned long long" like it would in C99. This is because in gnu89 mode "unsigned long long" is a GNU extension to C89 and isn't considered when selecting the type of the integer constant. The CRC64 support was added in 2013 and the code has been broken on 32-bit platforms unless one modified the Makefile to set C99 or a newer C standard. I didn't want to omit -std=gnu89 because Linux still uses it and xz_crc64.c (which isn't in Linux) was the only place that wasn't compatible with -std=gnu89. Thanks to bzt for reporting the problem.
2021-02-15xzminidec: Detect read errors from stdin.Lasse Collin
2021-02-12[LSC] Add LOCAL_LICENSE_KINDS to external/xz-embeddedandroid-s-preview-1Bob Badour
Added legacy_unencumbered to: Android.bp Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: I6cdef9939822acbd5da529ee9cefcd152883a2fe
2020-11-02Convert HTTP links to HTTPS links.Lasse Collin
Thanks to Alexander A. Klimov.
2020-11-02Drop a duplicated word in a comment in xz.h.Lasse Collin
Thanks to Randy Dunlap.
2020-04-29Add METADATA to xz-embedded: PublicDomain=UNENCUMBERED am: dbb9237e24 am: ↵Bob Badour
ff3dce8e7f am: 17ddf52272 am: a08354784c am: 26dae8dca0 Change-Id: I31117ceb157a50209607d9c7d854c0bbc4b66be1
2020-04-29Add METADATA to xz-embedded: PublicDomain=UNENCUMBERED am: dbb9237e24 am: ↵Bob Badour
ff3dce8e7f am: 17ddf52272 am: a08354784c Change-Id: Ib2bbf192dd40eb7fcb1941d6b4885acd5c231343
2020-04-29Add METADATA to xz-embedded: PublicDomain=UNENCUMBERED am: dbb9237e24 am: ↵Bob Badour
ff3dce8e7f am: 17ddf52272 Change-Id: I4b008f926b56e80a1bc209a7aee6cb0a3d19661f
2020-04-29Add METADATA to xz-embedded: PublicDomain=UNENCUMBERED am: dbb9237e24 am: ↵Bob Badour
ff3dce8e7f Change-Id: Iaba1828fadbc6961684dfe58468a02e2a32a7290
2020-04-29Add METADATA to xz-embedded: PublicDomain=UNENCUMBERED am: dbb9237e24android-r-beta-3android-r-beta-2Bob Badour
Change-Id: I6bbb983694bc6fecc2a5d708860ecc664d44cc26
2020-04-28Add METADATA to xz-embedded: PublicDomain=UNENCUMBEREDBob Badour
Bug: 68860345 Bug: 69058154 Bug: 151953481 Test: no code changes Change-Id: If6d7ed46d783928b60e39aef53d76b7fbbdc6342
2020-02-03Avoid overlapping memcpy() with invalid input with in-place decompression.Lasse Collin
With valid files, the safety margin described in lib/decompress_unxz.c ensures that these buffers cannot overlap. But if the uncompressed size of the input is larger than the caller thought, which is possible when the input file is invalid/corrupt, the buffers can overlap. Obviously the result will then be garbage (and usually the decoder will return an error too) but no other harm will happen when such an over-run occurs. This change only affects uncompressed LZMA2 chunks and so this should have no effect on performance.
2019-10-30Fix XZ_DYN_ALLOC to avoid useless memory reallocations.Lasse Collin
s->dict.allocated was initialized to 0 but never set after a successful allocation, thus the code always thought that the dictionary buffer has to be reallocated. Thanks to Yu Sun from Cisco Systems for reporting this bug.
2019-10-30Add bytetest to .gitignore.Lasse Collin
Thanks to DU HUANPENG.
2019-10-20userspace/Makefile: Add bytetest.o to "make clean".Lasse Collin
Thanks to DU HUANPENG.
2019-02-24[automerger skipped] DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-masterr_aml_301500702q_tzdata_aml_297100400q_tzdata_aml_297100300q_tzdata_aml_297100000q_tzdata_aml_296200000q_tzdata_aml_295600118q_tzdata_aml_295600110q_tzdata_aml_295500002q_tzdata_aml_295500001q_tzdata_aml_294400310android-vts-11.0_r9android-vts-11.0_r8android-vts-11.0_r7android-vts-11.0_r6android-vts-11.0_r5android-vts-11.0_r4android-vts-11.0_r3android-vts-11.0_r2android-vts-11.0_r16android-vts-11.0_r15android-vts-11.0_r14android-vts-11.0_r13android-vts-11.0_r12android-vts-11.0_r11android-vts-11.0_r10android-vts-11.0_r1android-security-11.0.0_r76android-security-11.0.0_r75android-security-11.0.0_r74android-security-11.0.0_r73android-security-11.0.0_r72android-security-11.0.0_r71android-security-11.0.0_r70android-security-11.0.0_r69android-security-11.0.0_r68android-security-11.0.0_r67android-security-11.0.0_r66android-security-11.0.0_r65android-security-11.0.0_r64android-security-11.0.0_r63android-security-11.0.0_r62android-security-11.0.0_r61android-security-11.0.0_r60android-security-11.0.0_r59android-security-11.0.0_r58android-security-11.0.0_r57android-security-11.0.0_r56android-security-11.0.0_r55android-security-11.0.0_r54android-security-11.0.0_r53android-security-11.0.0_r52android-security-11.0.0_r51android-security-11.0.0_r50android-security-11.0.0_r49android-security-11.0.0_r1android-r-preview-4android-r-preview-3android-r-preview-2android-r-preview-1android-platform-11.0.0_r9android-platform-11.0.0_r8android-platform-11.0.0_r7android-platform-11.0.0_r6android-platform-11.0.0_r5android-platform-11.0.0_r40android-platform-11.0.0_r4android-platform-11.0.0_r39android-platform-11.0.0_r38android-platform-11.0.0_r37android-platform-11.0.0_r36android-platform-11.0.0_r35android-platform-11.0.0_r34android-platform-11.0.0_r33android-platform-11.0.0_r32android-platform-11.0.0_r31android-platform-11.0.0_r30android-platform-11.0.0_r3android-platform-11.0.0_r29android-platform-11.0.0_r28android-platform-11.0.0_r27android-platform-11.0.0_r26android-platform-11.0.0_r25android-platform-11.0.0_r24android-platform-11.0.0_r23android-platform-11.0.0_r22android-platform-11.0.0_r21android-platform-11.0.0_r20android-platform-11.0.0_r2android-platform-11.0.0_r19android-platform-11.0.0_r18android-platform-11.0.0_r17android-platform-11.0.0_r16android-platform-11.0.0_r15android-platform-11.0.0_r14android-platform-11.0.0_r13android-platform-11.0.0_r12android-platform-11.0.0_r11android-platform-11.0.0_r10android-platform-11.0.0_r1android-mainline-12.0.0_r55android-mainline-12.0.0_r54android-mainline-12.0.0_r111android-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-mainline-10.0.0_r9android-mainline-10.0.0_r8android-mainline-10.0.0_r7android-mainline-10.0.0_r6android-mainline-10.0.0_r5android-mainline-10.0.0_r4android-mainline-10.0.0_r13android-mainline-10.0.0_r12android-mainline-10.0.0_r11android-mainline-10.0.0_r10android-cts-11.0_r9android-cts-11.0_r8android-cts-11.0_r7android-cts-11.0_r6android-cts-11.0_r5android-cts-11.0_r4android-cts-11.0_r3android-cts-11.0_r2android-cts-11.0_r16android-cts-11.0_r15android-cts-11.0_r14android-cts-11.0_r13android-cts-11.0_r12android-cts-11.0_r11android-cts-11.0_r10android-cts-11.0_r1android-11.0.0_r9android-11.0.0_r8android-11.0.0_r7android-11.0.0_r6android-11.0.0_r5android-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_r4android-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_r3android-11.0.0_r29android-11.0.0_r28android-11.0.0_r27android-11.0.0_r26android-11.0.0_r25android-11.0.0_r24android-11.0.0_r23android-11.0.0_r22android-11.0.0_r21android-11.0.0_r20android-11.0.0_r2android-11.0.0_r19android-11.0.0_r18android-11.0.0_r17android-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_r10android-11.0.0_r1android-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_r12q_tzdata_aml_297100000ndk-sysroot-r21android12-mainline-tzdata-releaseandroid11-tests-releaseandroid11-security-releaseandroid11-s1-releaseandroid11-releaseandroid11-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-platform-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-gsiandroid11-devandroid11-d2-releaseandroid11-d1-s7-releaseandroid11-d1-s6-releaseandroid11-d1-s5-releaseandroid11-d1-s1-releaseandroid11-d1-releaseandroid11-d1-b-releaseandroid10-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-tzdata-releaseandroid10-mainline-resolv-releaseandroid10-mainline-networking-releaseandroid10-mainline-media-releaseandroid10-devandroid10-d4-s1-releaseandroid10-d4-releaseandroid10-c2f2-s2-releaseandroid10-c2f2-s1-releaseandroid10-c2f2-releaseandroid10-android13-mainline-tzdata-releaseXin Li
am: f23903bb9f -s ours am skip reason: subject contains skip directive Change-Id: I741aeb99b65f134cd9789a46e406bb0760f2ead4
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: I934a50a456613c3de8c8dbf902d622a3b1f06e16
2019-01-09Add default code reviewers into OWNERS am: ef770d0dfc am: c4014a6c07Chih-Hung Hsieh
am: 42ce931349 Change-Id: I00482b5944dbdf60cb5d7208b6288fcc15805aec
2019-01-09Add default code reviewers into OWNERS am: ef770d0dfcChih-Hung Hsieh
am: c4014a6c07 Change-Id: I107b6a9e27c3e21ea6f676308a75a80a6903af24
2019-01-09Add default code reviewers into OWNERSChih-Hung Hsieh
am: ef770d0dfc Change-Id: Iefa4eedab193be36d04ba2c65ce05ae17d7a0c14
2019-01-09Add default code reviewers into OWNERSandroid-q-preview-6android-q-preview-5android-q-preview-4android-q-preview-2.5android-q-preview-1android-o-mr1-iot-release-1.0.12android-o-mr1-iot-release-1.0.10oreo-mr1-iot-releaseChih-Hung Hsieh
Bug: 33166666 Test: gerrit uploader Change-Id: Ice92f61c13d86faed20f02a8708dcccc39c1dc4a
2018-12-10[automerger skipped] DO NOT MERGE am: 19d3ceb83b -s ours am: 6124435b0c -s ↵Xin Li
ours am: b432667bad -s ours Change-Id: I6eb9e5755484709f50987dd3c7ea97b7a1eb4c0e
2018-12-10[automerger skipped] DO NOT MERGE am: 19d3ceb83b -s oursXin Li
am: 6124435b0c -s ours Change-Id: Id202ec0230f03b88e7ccdafcdf2517240ce1a35b
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-20 07:06:24 +0000