summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2024-03-07Merge "Merge Android 14 QPR2 to AOSP main" into mainHEADmastermainXin Li
2024-03-06Merge Android 14 QPR2 to AOSP mainXin Li
Bug: 319669529 Merged-In: I871969a49da5b6c1fa36ef917cdfb633f0e51e41 Change-Id: Ia509fbf6b559e93d914f12deee2cd2012b0faffd
2024-01-17Merge Android 24Q1 Release (ab/11220357)temp_319669529Xin Li
Bug: 319669529 Merged-In: I82c707ead5c62f31b5fb8a72404712ed67d8fb2c Change-Id: I871969a49da5b6c1fa36ef917cdfb633f0e51e41
2023-12-12Merge "Update MusicFX owner" into main am: 7a558193a0 am: bec8ae66b9 am: ↵Shunkai Yao
5ab0297e27 Original change: https://android-review.googlesource.com/c/platform/packages/apps/MusicFX/+/2871215 Change-Id: I03b82035ed41e8a0a4bd1e0b6936d1c9259b5c08 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-12[automerger skipped] Merge "MusicFx: add a KeepAliveService to allow client ↵Shunkai Yao
app to bind" into main am: b34fac6fb9 am: 41bdc4ce5f am: ff3ca77478 -s ours am skip reason: Merged-In Id751854861d10d5aa31dbb4ae471e403398b0e4e with SHA-1 db210697f4 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/MusicFX/+/2736934 Change-Id: I1e06ca1247003c451b7662113f0972e8e4aea22f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-12Merge "Update MusicFX owner" into main am: 7a558193a0 am: bec8ae66b9Shunkai Yao
Original change: https://android-review.googlesource.com/c/platform/packages/apps/MusicFX/+/2871215 Change-Id: I8efcf7b41665f36b6e38c6e18184e20bbc3e4921 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-12Merge "MusicFx: add a KeepAliveService to allow client app to bind" into ↵Shunkai Yao
main am: b34fac6fb9 am: 41bdc4ce5f Original change: https://android-review.googlesource.com/c/platform/packages/apps/MusicFX/+/2736934 Change-Id: I2fffe7eb486fdb4a7967b459e78930bdf692e9c4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-12Merge "Update MusicFX owner" into main am: 7a558193a0Shunkai Yao
Original change: https://android-review.googlesource.com/c/platform/packages/apps/MusicFX/+/2871215 Change-Id: I03b667d09c3406c9e6c966fc76f3c6c400f2e7ce Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-12Merge "MusicFx: add a KeepAliveService to allow client app to bind" into ↵Shunkai Yao
main am: b34fac6fb9 Original change: https://android-review.googlesource.com/c/platform/packages/apps/MusicFX/+/2736934 Change-Id: I7fe7f1111737e1d36540b473abe03a35f32e6b12 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-12Merge "Update MusicFX owner" into mainShunkai Yao
2023-12-12Merge "MusicFx: add a KeepAliveService to allow client app to bind" into mainShunkai Yao
2023-12-12Update MusicFX ownerShunkai Yao
Add elaurent@ and yaoshunkai@ Bug: 315987434 Test: m Change-Id: I04cfe8a863aa9b8fff9187908c477611961750df
2023-12-11[automerger skipped] Merge "Merge Android 14 QPR1" into main am: 6b4acfd7ae ↵Xin Li
-s ours am: 299a535f82 -s ours am: 106e8eb3b0 -s ours am skip reason: Merged-In I26db5a1f196272ee725e0193de3d07dcc09d42c7 with SHA-1 e5548d9965 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/MusicFX/+/2866387 Change-Id: Ia64cca52ce6db042a9bfd587241acfb022c78976 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-11[automerger skipped] Merge Android 14 QPR1 am: 4890f88a66 -s ours am: ↵Xin Li
d05a3e5075 -s ours am: 4f8a72e048 -s ours am skip reason: Merged-In I26db5a1f196272ee725e0193de3d07dcc09d42c7 with SHA-1 e5548d9965 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/MusicFX/+/2866387 Change-Id: I8ec57f28c2a85106204cb5421ed0e28dbbf48da0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-11[automerger skipped] Merge "Merge Android 14 QPR1" into main am: 6b4acfd7ae ↵Xin Li
-s ours am: 299a535f82 -s ours am skip reason: Merged-In I26db5a1f196272ee725e0193de3d07dcc09d42c7 with SHA-1 e5548d9965 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/MusicFX/+/2866387 Change-Id: If97f17e6de3a639bc21828135b7dc06a9f15178e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-11[automerger skipped] Merge Android 14 QPR1 am: 4890f88a66 -s ours am: ↵Xin Li
d05a3e5075 -s ours am skip reason: Merged-In I26db5a1f196272ee725e0193de3d07dcc09d42c7 with SHA-1 e5548d9965 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/MusicFX/+/2866387 Change-Id: I18553f2e921114c57e66fbc580308f5455bbdbd8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-11MusicFx: add a KeepAliveService to allow client app to bindShunkai Yao
So MusicFx activity can be same ProcessState as client APP Bug: 293204643 Bug: 265114634 Test: MusicFx BindService can be bind with the test app correctly Test: dumpsys activity Change-Id: Id751854861d10d5aa31dbb4ae471e403398b0e4e Merged-In: Id751854861d10d5aa31dbb4ae471e403398b0e4e
2023-12-11[automerger skipped] Merge "Merge Android 14 QPR1" into main am: 6b4acfd7ae ↵Xin Li
-s ours am skip reason: Merged-In I26db5a1f196272ee725e0193de3d07dcc09d42c7 with SHA-1 e5548d9965 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/MusicFX/+/2866387 Change-Id: Ib1c3978c9138cd138f44cf2ea6ba56a78c8bdca0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-11[automerger skipped] Merge Android 14 QPR1 am: 4890f88a66 -s oursXin Li
am skip reason: Merged-In I26db5a1f196272ee725e0193de3d07dcc09d42c7 with SHA-1 e5548d9965 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/MusicFX/+/2866387 Change-Id: Ic7133862179ff08a4118fd8c5022d9e8c5978c4e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-09Merge "Merge Android 14 QPR1" into mainXin Li
2023-12-08Merge Android 14 QPR1Xin Li
Merged-In: I26db5a1f196272ee725e0193de3d07dcc09d42c7 Bug: 315507370 Change-Id: I285c85a34b2336f1177d8e8998433b7a4d7e8852
2023-10-19Merge 10952656 am: e5548d9965 am: b941499f09Xin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/MusicFX/+/25090926 Change-Id: Ia5bdeb98f80ffaa0f77da37f9428574d55dc6581 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-19Merge 10952656 am: e5548d9965Xin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/MusicFX/+/25090926 Change-Id: I4cc437f0d09830f35a469bbb1b28f09b8924e26d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-17Merge 10952656tmp_amf_315507370Xin Li
Merged-In: Change-Id: I26db5a1f196272ee725e0193de3d07dcc09d42c7
2023-10-11Merge "MusicFx: add a KeepAliveService to allow client app to bind" into mainShunkai Yao
2023-10-10Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Automerger Merge Worker
0e745f8630 -s ours am: c81dde2752 -s ours am: cda73159df -s ours" into udc-qpr-dev-plus-aosp am: f8c1be394c -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/MusicFX/+/24980683 Change-Id: I5a5495f9d57e44a63629d4b1744dbb825b802412 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-10[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
0e745f8630 -s ours am: c81dde2752 -s ours am: cda73159df -s ours am: bbd1dab2be -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/MusicFX/+/24980683 Change-Id: I9e7cc28d4e461b754e141667030a2470d10ea072 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-10Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Automerger Merge Worker
0e745f8630 -s ours am: be982d1afe -s ours am: 4f0900788f -s ours" into udc-qpr-dev-plus-aosp am: 271b4c2b57 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/MusicFX/+/24980683 Change-Id: If19572a36ed95a173249214f12822044ee09e14d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-10[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
0e745f8630 -s ours am: be982d1afe -s ours am: 4f0900788f -s ours am: f28c02f9d7 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/MusicFX/+/24980683 Change-Id: Ie26785151c8813966c6978f1575ccb2f6b2d8c74 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-10[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
0e745f8630 -s ours am: be982d1afe -s ours am: 239709eb45 -s ours am: fec003919f -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/MusicFX/+/24980683 Change-Id: Ieec1309af48112d089623e94a8151c0e55e9b416 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-10Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Automerger Merge Worker
2b947d79b8 -s ours am: c4a2ecb735 -s ours" into udc-qpr-dev-plus-aosp am: d6fdb32b9b -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/MusicFX/+/24980684 Change-Id: I2a045c1c9abcbef0a7836a96ed427517cc44ec0a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-10[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
2b947d79b8 -s ours am: c4a2ecb735 -s ours am: 9a6b6c3fa9 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/MusicFX/+/24980684 Change-Id: I9f087b8beb2ba94b76103180a6d8cc5df2756f7e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-10[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
2b947d79b8 -s ours am: 6825169751 -s ours am: 773e8a4830 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/MusicFX/+/24980684 Change-Id: Iedca11e474b98232829afc28c3e169ded21c947c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-10Merge "Import translations. DO NOT MERGE ANYWHERE" into mainBill Yi
2023-10-10Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Automerger Merge Worker
0e745f8630 -s ours am: c81dde2752 -s ours am: cda73159df -s ours" into udc-qpr-dev-plus-aosp
2023-10-10Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Automerger Merge Worker
0e745f8630 -s ours am: be982d1afe -s ours am: 4f0900788f -s ours" into udc-qpr-dev-plus-aosp
2023-10-10[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
0e745f8630 -s ours am: c81dde2752 -s ours am: cda73159df -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/MusicFX/+/24980683 Change-Id: I654b10adaab9adf97b6fd93108eed360c11f062c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-10[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
0e745f8630 -s ours am: be982d1afe -s ours am: 4f0900788f -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/MusicFX/+/24980683 Change-Id: If0ec8a0b2a4acc3f0bc9337ca61f243795f2557e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-10[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
0e745f8630 -s ours am: be982d1afe -s ours am: 239709eb45 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/MusicFX/+/24980683 Change-Id: I9919dfce6290404eb05feeadc12042b89d191e9c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-10Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Automerger Merge Worker
2b947d79b8 -s ours am: c4a2ecb735 -s ours" into udc-qpr-dev-plus-aosp
2023-10-10[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
2b947d79b8 -s ours am: 6825169751 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/MusicFX/+/24980684 Change-Id: Id3fd743a7542ca88e7850574bee98101364910be Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-10[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
0e745f8630 -s ours am: 602ce2add5 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/MusicFX/+/24980683 Change-Id: I944801bf45591c96735a87e1c7f5f798b4e4e227 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-10[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
2b947d79b8 -s ours am: c4a2ecb735 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/MusicFX/+/24980684 Change-Id: I265e7851c26440ae5ef370f6a219ed9de3672972 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-10[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
0e745f8630 -s ours am: c81dde2752 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/MusicFX/+/24980683 Change-Id: I85b49e4fa29f1d80b2dac7c4803c047ebd4e71bd Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-10[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
0e745f8630 -s ours am: be982d1afe -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/MusicFX/+/24980683 Change-Id: I72baa59d5c09d7fb988d5abc353370cc7a449d8e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-10[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
2b947d79b8 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/MusicFX/+/24980684 Change-Id: If0f1c77e13072ccabc16283a04dbbea9142d834b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-10[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
0e745f8630 -s ours am: be982d1afe -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/MusicFX/+/24980683 Change-Id: Ief7621988c63921889f7a2f71cbf30e8dc1591f7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-10[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
2b947d79b8 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/MusicFX/+/24980684 Change-Id: I6e608b123386c3508ba098e3db95b176432f88b0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-10[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
0e745f8630 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/MusicFX/+/24980683 Change-Id: I273e438eb1a99d91f096fd98957632603c25ec03 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-10[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
0e745f8630 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/MusicFX/+/24980683 Change-Id: I0542ceecba6b6f85954aa6f8079670992b776a9d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-27 22:09:37 +0000