summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2022-04-08Snap for 8426163 from db559e6dfbcc23dfe94c286d233eba5bbf283df1 to ↵android-mainline-12.0.0_r112aml_tz2_305400500aml_tz2_305400300aml_tz2_305400100aml_tz2_304500300aml_tz2_303900110aml_tz2_303900102aml_tz2_303800002aml_tz2_303800001aml_tz2_303200001android12-mainline-tzdata2-releaseaml_tz2_305400100Android Build Coastguard Worker
mainline-tzdata2-release Change-Id: Ib81b04f637d90ca8cc8c4e1e9cda10d1fcb8fe7a
2021-10-07Snap for 7803083 from ae1f73dad61cd0222b62a6cbc50f9c8a48d8e13c to ↵Android Build Coastguard Worker
mainline-tzdata2-release Change-Id: Iea8f7605c3359b90e710347515fa84e954f45232
2021-09-08Clean up ownership in external/exoplayer/ am: a0cf58879fSantiago Seifert
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/exoplayer/+/15778520 Change-Id: Id71c7bd5e2a62cb461e9d584dcf3b49e97826b5c
2021-09-07Clean up ownership in external/exoplayer/Santiago Seifert
This is a cherrypick of aosp/1803743. Bug: 197217250 Change-Id: I180365755982ec1dffdaa5a5a2af5595f4788571 Merged-In: I180365755982ec1dffdaa5a5a2af5595f4788571 Test: No code changes done.
2021-05-18[automerger skipped] Make exoplayer2-extractor target a java_library am: ↵android-mainline-12.0.0_r5Santiago Seifert
db559e6dfb -s ours am: 38be97903f -s ours am skip reason: Merged-In If7a41d8acecb56c50e14eda4887e6223e44443c2 with SHA-1 3a09f971cb is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/exoplayer/+/14600858 Change-Id: If2233896d053eebc401dd11913e77d78d6f409e0
2021-05-17[automerger skipped] Make exoplayer2-extractor target a java_library am: ↵android12-devSantiago Seifert
db559e6dfb -s ours am skip reason: Merged-In If7a41d8acecb56c50e14eda4887e6223e44443c2 with SHA-1 3a09f971cb is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/exoplayer/+/14600858 Change-Id: I3f78d9d414066a664dffd7fe6a6b3a9b5303d01f
2021-05-17Make exoplayer2-extractor target a java_library am: 3a09f971cbSantiago Seifert
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/exoplayer/+/14601651 Change-Id: Ia6b4574839f9841575856752c2d7a1a242ad27e8
2021-05-17Make exoplayer2-extractor target a java_librarySantiago Seifert
Bug: 188212762 Test: Flashed physical device. Test: atest CtsMediaParserTestCases CtsMediaParserHostTestCases Change-Id: If7a41d8acecb56c50e14eda4887e6223e44443c2
2021-05-17Make exoplayer2-extractor target a java_librarySantiago Seifert
Bug: 188212762 Test: Flashed physical device. Test: atest CtsMediaParserTestCases CtsMediaParserHostTestCases Change-Id: If7a41d8acecb56c50e14eda4887e6223e44443c2 Merged-In: If7a41d8acecb56c50e14eda4887e6223e44443c2
2021-04-08[automerger skipped] Merge "Fix external/exoplayer TEST_MAPPING" into sc-dev ↵Santiago Seifert
am: 918887c9bf -s ours am skip reason: skip tag Change-Id I92fee38887ad30ea2586329afda30b3a2d54bd1c with SHA-1 654491318e is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/exoplayer/+/14113485 Change-Id: I4f42876746c7e66f296a6fa9357d7cc168f493d2
2021-04-08Merge "Fix external/exoplayer TEST_MAPPING" into sc-devSantiago Seifert
2021-04-07[automerger skipped] Fix external/exoplayer TEST_MAPPING am: 654491318e -s ↵Santiago Seifert
ours am: cd1d6aa813 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/exoplayer/+/14103519 Change-Id: Iac01b1861b5cf9a3c422d63b955aa2afecd6f2d7
2021-04-07[automerger skipped] Fix external/exoplayer TEST_MAPPING am: 654491318e -s oursSantiago Seifert
am skip reason: skipped by user aquilescanta Original change: https://googleplex-android-review.googlesource.com/c/platform/external/exoplayer/+/14103519 Change-Id: Iaf8e0f3566d9ac8a7c8cee8b98828274de19253c
2021-04-07Fix external/exoplayer TEST_MAPPINGSantiago Seifert
Bug:184704729 Test: N/A. Change-Id: I92fee38887ad30ea2586329afda30b3a2d54bd1c Merged-In: I92fee38887ad30ea2586329afda30b3a2d54bd1c (cherry picked from commit 88a64e039d1881a022421bf703b58dad988c28ee)
2021-04-07Fix external/exoplayer TEST_MAPPINGSantiago Seifert
Bug:184704729 Test: N/A. Change-Id: I92fee38887ad30ea2586329afda30b3a2d54bd1c Merged-In: I92fee38887ad30ea2586329afda30b3a2d54bd1c
2021-02-16[LSC] Add LOCAL_LICENSE_KINDS to external/exoplayer am: 5551238e47 am: ↵Bob Badour
9b1f7d9e57 am: 314b3df463 am: aec7f44f38 Original change: https://android-review.googlesource.com/c/platform/external/exoplayer/+/1588862 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I291704455c919fff725997243b86b1e1714f4c1a
2021-02-16[LSC] Add LOCAL_LICENSE_KINDS to external/exoplayer am: 5551238e47 am: ↵Bob Badour
9b1f7d9e57 am: 314b3df463 Original change: https://android-review.googlesource.com/c/platform/external/exoplayer/+/1588862 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ib72937153796a0d5d701b29d9330bb8f13f6bd4c
2021-02-16[LSC] Add LOCAL_LICENSE_KINDS to external/exoplayer am: 5551238e47 am: ↵Bob Badour
9b1f7d9e57 Original change: https://android-review.googlesource.com/c/platform/external/exoplayer/+/1588862 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I434950da8fef535edff4e3a36dd756b0b028b452
2021-02-16[LSC] Add LOCAL_LICENSE_KINDS to external/exoplayer am: 5551238e47android-s-beta-4android-s-beta-3android-s-beta-2android-s-beta-1android-s-beta-4Bob Badour
Original change: https://android-review.googlesource.com/c/platform/external/exoplayer/+/1588862 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I233745cdd7c8430e5be5a5535f36cf26c2d6bf6f
2021-02-12[LSC] Add LOCAL_LICENSE_KINDS to external/exoplayerandroid-s-preview-1Bob Badour
Added SPDX-license-identifier-Apache-2.0 to: Android.bp tree/extensions/ffmpeg/src/main/jni/Android.mk tree/extensions/flac/src/main/jni/Android.mk tree/extensions/opus/src/main/jni/Android.mk tree/extensions/opus/src/main/jni/libopus.mk tree/extensions/vp9/src/main/jni/Android.mk tree/extensions/vp9/src/main/jni/libvpx.mk Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: Id966ec3b31c8d725244ad8babc1d2f7b7abb0cd5
2020-11-10Merge "Tweak annotation_template.java to return String[] from expression()"Ian Baker
2020-11-09Add MediaParser hostside tests to external/exoplayer presubmitSantiago Seifert
Bug: 158742256 Change-Id: Ia3d02de08a4d7b117f38b6b4dd39bdb6b22cf358
2020-11-09Tweak annotation_template.java to return String[] from expression()Ian Baker
EnsuresNonNullIf supports multiple Strings for this annotation argument: https://checkerframework.org/api/org/checkerframework/checker/nullness/qual/EnsuresNonNullIf.html#expression-- This is compatible with any annotations that only allow a single string, because annotations allow a single-element array to be declared without the braces. Test: atest CtsMediaParserTestCases Change-Id: I0dcecb954466c850821394be10e48cdb9821dc22
2020-09-13Remove unnecessary lines am: a3bff77ab8 am: de643c943eSantiago Seifert
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/exoplayer/+/11833774 Change-Id: I6c215a1e21794b0a4dc813fb945638f226c5cd40
2020-09-13Set min_sdk_version to be part of mainline modules am: 90084be6e3 am: 3d048b6a0eJooyung Han
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/exoplayer/+/11571143 Change-Id: I56eaefa254937a288095a0830c3d80148e38fa78
2020-06-11Merge "Merge "Remove unnecessary lines am: a3bff77ab8 am: 5fe66b0de3" into ↵Automerger Merge Worker
rvc-d1-dev-plus-aosp am: 99d214b9d3" into rvc-qpr-dev-plus-aosp am: 908cc7dc04 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/exoplayer/+/11833774 Change-Id: I96962eb2380bf694f89270d3d1a9780476b81979
2020-06-11Remove unnecessary lines am: a3bff77ab8 am: 5fe66b0de3 am: 1367a0c6e6 am: ↵Santiago Seifert
35e83d0d87 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/exoplayer/+/11833774 Change-Id: Ie00bf9a6181a7fbdc559ec2ae28d4ef116b28c09
2020-06-11Remove unnecessary lines am: a3bff77ab8 am: 2072b8f4b6 am: e0f7242812 am: ↵Santiago Seifert
49fabcd1e9 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/exoplayer/+/11833774 Change-Id: Ib8cdb613b16a831fe2b416f93886a64a0bf3be1a
2020-06-11Merge "Merge "Remove unnecessary lines am: a3bff77ab8 am: 5fe66b0de3" into ↵Automerger Merge Worker
rvc-d1-dev-plus-aosp am: 99d214b9d3" into rvc-qpr-dev-plus-aosp
2020-06-11Merge "Remove unnecessary lines am: a3bff77ab8 am: 5fe66b0de3" into ↵Automerger Merge Worker
rvc-d1-dev-plus-aosp am: 99d214b9d3 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/exoplayer/+/11833774 Change-Id: I081ddb97f22ca36bc574e766aba06c15ae8a9503
2020-06-11Remove unnecessary lines am: a3bff77ab8 am: 5fe66b0de3 am: 1367a0c6e6Santiago Seifert
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/exoplayer/+/11833774 Change-Id: I003a3f75038aa3a997231622eba09b23e082791f
2020-06-11Remove unnecessary lines am: a3bff77ab8 am: 2072b8f4b6 am: e0f7242812Santiago Seifert
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/exoplayer/+/11833774 Change-Id: I6cecbace6bc0711cbadcd8cd8f70f24184a1f90f
2020-06-11Merge "Remove unnecessary lines am: a3bff77ab8 am: 5fe66b0de3" into ↵Automerger Merge Worker
rvc-d1-dev-plus-aosp
2020-06-11Remove unnecessary lines am: a3bff77ab8 am: 5fe66b0de3Santiago Seifert
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/exoplayer/+/11833774 Change-Id: Ic31636e1581ff13cf64dc0f1b7854391b28859ac
2020-06-11Remove unnecessary lines am: a3bff77ab8 am: 2072b8f4b6Santiago Seifert
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/exoplayer/+/11833774 Change-Id: I6ec2467d41fb3042f57aa079e24d89447704ac40
2020-06-11Remove unnecessary lines am: a3bff77ab8 am: 5fe66b0de3android-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-releaseSantiago Seifert
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/exoplayer/+/11833774 Change-Id: I46b18089d872fd56f924cf8538d441c4cdd92b74
2020-06-11Remove unnecessary lines am: a3bff77ab8android-mainline-11.0.0_r44android-mainline-11.0.0_r37android-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-os-statsd-releaseandroid11-mainline-extservices-releaseandroid11-mainline-conscrypt-releaseandroid11-mainline-cellbroadcast-releaseSantiago Seifert
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/exoplayer/+/11833774 Change-Id: If6d0d76be5a49bd391a1b4ecdd0519b7b219090f
2020-06-11Remove unnecessary lines am: a3bff77ab8platform-tools-30.0.5Santiago Seifert
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/exoplayer/+/11833774 Change-Id: I993145493225bb5aa923a0b7a1a72e7979e042f5
2020-06-11Remove unnecessary lines am: a3bff77ab8android-11.0.0_r16android11-d1-b-releaseSantiago Seifert
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/exoplayer/+/11833774 Change-Id: I7228144097ed83af882a2176f8be82170f8a233d
2020-06-11Remove unnecessary linesandroid11-devSantiago Seifert
Bug: 153170106 Test: Manual. Change-Id: If17198f306931feb2f54128f9a16121346d6278c
2020-05-26Set min_sdk_version to be part of mainline modules am: 90084be6e3 am: ↵Jooyung Han
62f0e3c336 am: acd426b61f am: a7996d3d93 Change-Id: I86cf0e92942f2e92c8dc717e0b2ad67a4fa2b6be
2020-05-26Set min_sdk_version to be part of mainline modules am: 90084be6e3 am: ↵Jooyung Han
21714e71d6 am: d2962afbe3 am: a6120bbe50 Change-Id: I7a82d730d59e4628ab563ed5b2c91d18a24eec96
2020-05-26Set min_sdk_version to be part of mainline modules am: 90084be6e3 am: ↵Jooyung Han
21714e71d6 am: 185ee24171 am: d0d43a8f15 Change-Id: I040a1200b57d9b39a0ba4b70a2a139f92e12065f
2020-05-26Set min_sdk_version to be part of mainline modules am: 90084be6e3 am: ↵Jooyung Han
62f0e3c336 am: acd426b61f Change-Id: Iae1ac6a25f01005716d8605e62521a01a3815577
2020-05-26Set min_sdk_version to be part of mainline modules am: 90084be6e3 am: ↵Jooyung Han
21714e71d6 am: d2962afbe3 Change-Id: If02df0c228ba8197bde32020a1068c45fc313914
2020-05-26Set min_sdk_version to be part of mainline modules am: 90084be6e3 am: ↵Jooyung Han
21714e71d6 am: 185ee24171 Change-Id: Ia619f671340b238dfc11c45ccf6b5575dd3d6a42
2020-05-26Set min_sdk_version to be part of mainline modules am: 90084be6e3 am: 21714e71d6Jooyung Han
Change-Id: Iacde250075312626e3cd1919314c366ba2660aae
2020-05-26Set min_sdk_version to be part of mainline modules am: 90084be6e3 am: 62f0e3c336Jooyung Han
Change-Id: I11e5a132e308aaa1f0ff854fe5bfdeb7da429687
2020-05-26Set min_sdk_version to be part of mainline modules am: 90084be6e3 am: 21714e71d6Jooyung Han
Change-Id: I47aea4e30035609417d4873132e64a662d57250c
2020-05-26Set min_sdk_version to be part of mainline modules am: 90084be6e3Jooyung Han
Change-Id: Ic98d709f8594ef79faaf5b8b2aa577e7c72c67e0
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-11 01:13:08 +0000