summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-02-20Mark ab/7061308 as merged in stage.android-s-beta-5android-s-beta-4android-s-beta-3android-s-beta-2android-s-beta-1android-s-beta-5android-s-beta-4Xin Li
Bug: 180401296 Merged-In: Ib86d80f0150ed2072f1e4f68aaed6ab45a51050b Change-Id: I8bf9f2583c39c18831233757d816d514b7f402c3
2021-02-05Merge "[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/MusicFX" am: e87ccc4e4fBob Badour
Original change: https://android-review.googlesource.com/c/platform/packages/apps/MusicFX/+/1576198 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I67ff2e834ab55529bcb5f6086f88d68734703c99
2021-02-05Merge "[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/MusicFX"android-s-preview-1Bob Badour
2021-02-05[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/MusicFXBob Badour
Added SPDX-license-identifier-Apache-2.0 to: Android.bp Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: I412bc8531e5b7dafb8ad772dfb6fbed4580efea1
2020-11-23Mark ab/6881855 as merged am: 331d3f4477Xin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/MusicFX/+/13113080 Change-Id: Ib86d80f0150ed2072f1e4f68aaed6ab45a51050b
2020-11-23Mark ab/6881855 as mergedXin Li
Bug: 172690556 Change-Id: Id3c1ade1559ecedbcaf994f1d4bbfd52bb5e57bc
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: d2870bcfee -s ours am: ↵Xin Li
84e18d8aa6 -s ours am skip reason: Change-Id I1028fa12ac483ce6a08c59e7909cfcc89842663b with SHA-1 1107c76fea is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/MusicFX/+/12796935 Change-Id: I5c315bc994c300e8d2116a0c064def7ae823478d
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: d2870bcfee -s oursXin Li
am skip reason: Change-Id I1028fa12ac483ce6a08c59e7909cfcc89842663b with SHA-1 1107c76fea is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/MusicFX/+/12796935 Change-Id: Ie5de499ec7eb8161d2d0c61996a51243d0fc008b
2020-10-08Skip ab/6749736 in stage.Xin Li
Merged-In: I1028fa12ac483ce6a08c59e7909cfcc89842663b Change-Id: Icc8f5153d1b1b8faea3f48c7790c359d7f528c65
2020-09-11[automerger skipped] Merge "Merge Android R" am: a7bab68d67 -s ours am: ↵Xin Li
0646ab8e6a -s ours am: b34877ec14 -s ours am: 882d991592 -s ours am skip reason: Change-Id I70ad704d57cf44adc2ea390881b32c7d440a79c1 with SHA-1 6304fb7c26 is in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/MusicFX/+/1422458 Change-Id: Idbd306c42e745bf1e9fb7bafbc248024e7e54928
2020-09-11[automerger skipped] Merge "Merge Android R" am: a7bab68d67 -s ours am: ↵Xin Li
0646ab8e6a -s ours am: b34877ec14 -s ours am skip reason: Change-Id I70ad704d57cf44adc2ea390881b32c7d440a79c1 with SHA-1 6304fb7c26 is in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/MusicFX/+/1422458 Change-Id: I1bf95da40559cfb51bbb5748b311d36fde8ab465
2020-09-11[automerger skipped] Merge "Merge Android R" am: a7bab68d67 -s ours am: ↵Xin Li
0646ab8e6a -s ours am skip reason: Change-Id I70ad704d57cf44adc2ea390881b32c7d440a79c1 with SHA-1 6304fb7c26 is in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/MusicFX/+/1422458 Change-Id: Idf100cd67a05924ceedce0e7b4cfdef458805ebc
2020-09-11[automerger skipped] Merge "Merge Android R" am: a7bab68d67 -s oursXin Li
am skip reason: Change-Id I70ad704d57cf44adc2ea390881b32c7d440a79c1 with SHA-1 6304fb7c26 is in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/MusicFX/+/1422458 Change-Id: I3d707d2f1f6c3610c64521ab3bb7034c4ee134f3
2020-09-10Merge "Merge Android R"Xin Li
2020-09-08Merge Android RXin Li
Bug: 168057903 Merged-In: I70ad704d57cf44adc2ea390881b32c7d440a79c1 Change-Id: I565a52f9b89e3c35de7dde34c4d44ce233efb8f5
2020-09-01[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: 6304fb7c26 -s ours am: 68fc4a622a -s ours am: f3c4acebdc -s ours am skip reason: Change-Id I2051f7d43d24dd9c925f6626be03034b3eb9c228 with SHA-1 1610a1919f is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/MusicFX/+/12470135 Change-Id: I90b1c16d724f4350e5a777568f0bf86f66db5068
2020-09-01[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: 6304fb7c26 -s ours am: 68fc4a622a -s ours am skip reason: Change-Id I2051f7d43d24dd9c925f6626be03034b3eb9c228 with SHA-1 1610a1919f is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/MusicFX/+/12470135 Change-Id: I19c717fbe1be5286f763b56cbff913273387858d
2020-09-01[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: 6304fb7c26 -s ours am skip reason: Change-Id I2051f7d43d24dd9c925f6626be03034b3eb9c228 with SHA-1 1610a1919f is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/MusicFX/+/12470135 Change-Id: I469fcba25b17fd0a2867e434a15e1e5536398db0
2020-08-27Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)temp_sam_168057903Xin Li
Bug: 166295507 Merged-In: I2051f7d43d24dd9c925f6626be03034b3eb9c228 Change-Id: I70ad704d57cf44adc2ea390881b32c7d440a79c1
2020-07-31Merge "AOSP/MusicFX - Update language to comply with Android's inclusive ↵Treehugger Robot
language guidance." am: db9d2df722 am: 2581753df2 am: 5ec4cbbdc4 am: 1107c76fea Original change: https://android-review.googlesource.com/c/platform/packages/apps/MusicFX/+/1377757 Change-Id: I7ce257e0089a2496bbdd0aba327cfd7579b798d2
2020-07-31Merge "AOSP/MusicFX - Update language to comply with Android's inclusive ↵Treehugger Robot
language guidance." am: db9d2df722 am: 2581753df2 am: 5ec4cbbdc4 Original change: https://android-review.googlesource.com/c/platform/packages/apps/MusicFX/+/1377757 Change-Id: I1028fa12ac483ce6a08c59e7909cfcc89842663b
2020-07-31Merge "AOSP/MusicFX - Update language to comply with Android's inclusive ↵Treehugger Robot
language guidance." am: db9d2df722 am: 2581753df2 Original change: https://android-review.googlesource.com/c/platform/packages/apps/MusicFX/+/1377757 Change-Id: I4fc9b800f33cd457dbe78329a6475658ca2e771d
2020-07-31Merge "AOSP/MusicFX - Update language to comply with Android's inclusive ↵Treehugger Robot
language guidance." am: db9d2df722 Original change: https://android-review.googlesource.com/c/platform/packages/apps/MusicFX/+/1377757 Change-Id: Id0350a40b42e336848d08ad80cefc6281b0d176c
2020-07-31Merge "AOSP/MusicFX - Update language to comply with Android's inclusive ↵Treehugger Robot
language guidance."
2020-07-29AOSP/MusicFX - Update language to comply with Android's inclusive language ↵Raman Tenneti
guidance. See https://source.android.com/setup/contribute/respectful-code for reference BUG=161896447 Test: make Change-Id: Ibd237b396759c40e02cb171416e2fbde29fce197
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: d9f1d2d3cb -s ours am: 1610a1919f am: a717824cca Change-Id: I467638184d01e11cf32f54d4e2673b40435ac205
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: d9f1d2d3cb -s ours am: 1610a1919f Change-Id: Ide57addfa895849c608be4303c5b4b3d85e42c9a
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: d9f1d2d3cb -s ours am skip reason: subject contains skip directive Change-Id: I2051f7d43d24dd9c925f6626be03034b3eb9c228
2020-04-09DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-masterandroid-r-beta-3android-r-beta-2Xin Li
Bug: 151763422 Change-Id: I4c8d4241632ae20da0a87f90303990f39d9e8c9c
2020-03-31Merge "Add an exported flag in manifest" am: 5fdcb74ecf am: bf7e88d1e5 am: ↵Treehugger Robot
369f404515 am: 846a245156 Change-Id: Ie5ae22682ff476ad628f7bfefe1169ac8e21547a
2020-03-31Merge "Add an exported flag in manifest" am: 5fdcb74ecf am: bf7e88d1e5 am: ↵Treehugger Robot
369f404515 Change-Id: I75693fd50ef21dfe1f71e0562f74f8829d1f4c6d
2020-03-31Merge "Add an exported flag in manifest" am: 5fdcb74ecf am: bf7e88d1e5Treehugger Robot
Change-Id: Ic4b7feb3389b7e825b8241e3164d5606668a76b2
2020-03-31Merge "Add an exported flag in manifest" am: 5fdcb74ecf am: bf7e88d1e5Treehugger Robot
Change-Id: I411ed013f1a7544da6e2bf3107a6fff8146b5f0a
2020-03-31Merge "Add an exported flag in manifest" am: 5fdcb74ecfTreehugger Robot
Change-Id: Icb1f0d1080a3fb7065c27ce4742aba04a21448cf
2020-03-31Merge "Add an exported flag in manifest"Treehugger Robot
2020-03-23Add an exported flag in manifestAshwini Oruganti
With b/150232615, we will need an explicit value set for the exported flag when intent filters are present, as the default behavior is changing for S+. This change adds the value reflecting the previous default to the manifest. These changes were made using an automated tool, the xml file may be reformatted slightly creating a larger diff. The only "real" change is the addition of "android:exported" to activities, services, and receivers that have one or more intent-filters. Bug: 150232615 Test: TH Exempt-From-Owner-Approval: mechanical refactoring Change-Id: I7d93229ed83ea46c16b3cd928ebd04d4d04eb7ec
2019-10-30[automerger skipped] DO NOT MERGE - ↵r_aml_301500702android-mainline-12.0.0_r55android-mainline-12.0.0_r112android-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_r10aml_tz2_305400500aml_tz2_305400300aml_tz2_305400100aml_tz2_304500300aml_tz2_303900110aml_tz2_303900102aml_tz2_303800002aml_tz2_303800001aml_tz2_303200001android12-mainline-tzdata2-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-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-releaseaml_tz2_305400100Xin Li
qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master am: a7861dc74e am: c7ce7324e3 -s ours am skip reason: subject contains skip directive Change-Id: I9995e31f1eec5762409024f4441cb8009332c77a
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: a7861dc74e Change-Id: I282d1448af13372f0b3432ff4f93530ae2a531a5
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: I04996f83a15c40e714af9c43dcee08a550e75eaf
2019-09-11[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into ↵Xin Li
stage-aosp-master am: f6b4b11432 -s ours am: 42550b01a4 -s ours am: fa3f44de1f -s ours am skip reason: change_id I245080494d61372a3d972fc87e1ccc5ad8e8ed5a with SHA1 8a66b667d2 is in history Change-Id: I69b31f6b4330b422a8c5fe3cc2f8ddf3362bfa3f
2019-09-08[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into ↵Xin Li
stage-aosp-master am: f6b4b11432 -s ours am: 42550b01a4 -s ours am skip reason: change_id I245080494d61372a3d972fc87e1ccc5ad8e8ed5a with SHA1 8a66b667d2 is in history Change-Id: Iea86e145b7d15376b820a3ae7cdebfa1970053c1
2019-09-08[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into ↵Xin Li
stage-aosp-master am: f6b4b11432 -s ours am skip reason: change_id I245080494d61372a3d972fc87e1ccc5ad8e8ed5a with SHA1 8a66b667d2 is in history Change-Id: If1e749c4ee5b7ffa69624151139202895a157db0
2019-09-08Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-masterXin Li
No content change. Bug: 135460123 Change-Id: Iebb984fee5237bb2a06c2474798869cce9398ea8 Merged-In: I245080494d61372a3d972fc87e1ccc5ad8e8ed5a
2019-09-05[automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master" am: ↵Xin Li
2cc0d2edfa -s ours am: a8b03b1c84 am: cffed061cb am: 4b738daa92 -s ours am skip reason: subject contains skip directive Change-Id: I067d775838b25c25814b1d52d566160476c67181
2019-09-05[automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master" am: ↵Xin Li
2cc0d2edfa -s ours am: a8b03b1c84 am: cffed061cb Change-Id: Ifa6a9b074af0e2cda2b471decff452d673ac9cf2
2019-09-05[automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master" am: ↵Xin Li
2cc0d2edfa -s ours am: a8b03b1c84 Change-Id: Id51480121b10a0b068488fc9882530951b649964
2019-09-05[automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master"Xin Li
am: 2cc0d2edfa -s ours am skip reason: subject contains skip directive Change-Id: I46c924db534ced6877f289eccc910a6db94d8ce1
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: I245080494d61372a3d972fc87e1ccc5ad8e8ed5a
2019-07-02[automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor ↵Xin Li
(5699924) into stage-aosp-master am: f4fd99dbe3 am: eaad28d964 -s ours am skip reason: subject contains skip directive Change-Id: I8e4ae657d58ad8751375235fe51eabe23743d1f9
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-20 19:09:02 +0000