summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2022-03-04Snap for 8249440 from abf85922a01bddfd42a41fa781a94cec6a8c58dc to ↵android-12.1.0_r9android-12.1.0_r8android-12.1.0_r7android-12.1.0_r22android-12.1.0_r21android-12.1.0_r20android-12.1.0_r19android-12.1.0_r11android-12.1.0_r10android12-qpr3-s7-releaseandroid12-qpr3-s6-releaseandroid12-qpr3-s5-releaseandroid12-qpr3-s4-releaseandroid12-qpr3-s3-releaseandroid12-qpr3-s2-releaseandroid12-qpr3-s1-releaseandroid12-qpr3-releaseAndroid Build Coastguard Worker
sc-qpr3-release Change-Id: Ia11b9038064df9d5e1aeec829ebaa741e342ed1b
2022-03-03Merge changes from topic "presubmit-am-3477c0277e054c1eb3151c2929416686" ↵TreeHugger Robot
into sc-qpr1-dev am: 625e448275 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/MusicFX/+/17058186 Change-Id: I9865f256ecf69015437cf26bcc28b547bc8faa09
2022-03-03[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ↵Bill Yi
ANYWHERE 2p: 03f2304bfb am: b9b4d95e21 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/MusicFX/+/17058186 Change-Id: I436e7b0cd88603bd4345fb59b7410cd9d4896db8
2022-03-03Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-devTreeHugger Robot
2022-03-03[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
9124811c4f -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/MusicFX/+/17058188 Change-Id: Iee0c89c6b887d6a135a91387b565c7abccbe0503
2022-03-03Merge changes from topic "presubmit-am-3477c0277e054c1eb3151c2929416686" ↵TreeHugger Robot
into sc-qpr1-dev * changes: [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 03f2304bfb Import translations. DO NOT MERGE ANYWHERE
2022-03-02Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: Id1cf12873051cbee5470251885816121a0eddbb2
2022-03-02Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I7887443015408883c9badb13c9e0fe45e3bbae42
2022-03-02[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 03f2304bfbBill Yi
Blank merge reason: commit message contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/MusicFX/+/17058186 Change-Id: Iebadc08aa233c1f821101c23e1d7e0e7a435f868
2022-03-02Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I3a716f1a537c534011a0c1879a89c8c8595907d9
2021-12-09save opened audio sessions even isGlobalEnabled is falseandroid12L-devDavid Li
Players boardcast the open event when an audio session is opened. MusicFX need to save the audio session ID for the future usage even isGlobalEnabled is false. Bug: 208586226 Test: mm MusicFX Change-Id: I04bb45ca7b5359760cb35f108a0fdae7b1634535
2021-11-10Merge "Remove audioSession and use the stored one in ControlPanelEffect" ↵David Li
into sc-v2-dev
2021-11-10Remove audioSession and use the stored one in ControlPanelEffectDavid Li
1. Remove audioSession parameter and use the audio session associated by package name and stored in ControlPanelEffect to avoid accessing dangling audio session. 2. Replace AudioEffect.ERROR_BAD_VALUE with AUDIO_SESSION_ID_UNSPECIFIED(AudioManager.AUDIO_SESSION_ID_GENERATE) as the default value of audio sessions. 3. Retrieve the audio session by the package name if the intent doesn't contain the audio session. Bug: 186112463 Test: mm MusicFX Change-Id: Ie37274aebacf34d69af7ce21a267cfdc2cce02e1
2021-09-11Merge changes from topic "presubmit-am-1e24e64f3cda4adab2349144c1c6cdeb" ↵Bill Yi
into sc-qpr1-dev am: f08eabfa1a Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/MusicFX/+/15804485 Change-Id: Ibb044b159e6173c26bfdcbd435c69b709dad1c70
2021-09-11[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ↵Bill Yi
ANYWHERE 2p: 54a4147900 am: 3c2158ddd5 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/MusicFX/+/15804485 Change-Id: I4890e0449c4a101cfa7ace796e737a299a73c3e9
2021-09-11[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
576ff6b2cc -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/MusicFX/+/15804968 Change-Id: Ie689a5438f4200de4876e609436a0d74f197b147
2021-09-11Merge changes from topic "presubmit-am-1e24e64f3cda4adab2349144c1c6cdeb" ↵android-12.0.0_r32android-12.0.0_r29android-12.0.0_r27android-12.0.0_r21android-12.0.0_r20android-12.0.0_r19android-12.0.0_r18android12-qpr1-d-s3-releaseandroid12-qpr1-d-s2-releaseandroid12-qpr1-d-s1-releaseandroid12-qpr1-d-releaseBill Yi
into sc-qpr1-dev * changes: [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 54a4147900 Import translations. DO NOT MERGE ANYWHERE
2021-09-10Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I1c6ed8e3808631252b776cd283b0ff48a81589c4
2021-09-10Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: Idccc536e62a907d3fc54aad604898bc7bd6bad1a
2021-09-10[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 54a4147900Bill Yi
Blank merge reason: commit message contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/MusicFX/+/15804485 Change-Id: I338b1722ee27f85a29dc9b385e85134786428dc5
2021-09-10Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: If6cb22809441a2e329a9654fcd6404ddcb2b0155
2021-08-29Merge changes from topic "presubmit-am-5cb4114aac274ba49368b09bf57705ff" ↵Bill Yi
into sc-qpr1-dev am: e6eb2a4c21 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/MusicFX/+/15688866 Change-Id: I1b55809d9caaa57447363e50a444e9be1df65ae6
2021-08-29[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ↵Bill Yi
ANYWHERE 2p: aec163e30b am: 98b353ae28 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/MusicFX/+/15688866 Change-Id: If34bdc12366f9ebadd99e72cfd91c979a105235b
2021-08-29Merge changes from topic "presubmit-am-5cb4114aac274ba49368b09bf57705ff" ↵Bill Yi
into sc-qpr1-dev * changes: [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: aec163e30b Import translations. DO NOT MERGE ANYWHERE
2021-08-28[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
7dfe08ee92 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/MusicFX/+/15688869 Change-Id: Ibf5b41a637a9dffbbc6dd1273350a48038d2899e
2021-08-27Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: Ie4bb93417ab0b7433f3ff9c4e2b7ede1a8b9a9c1
2021-08-27Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I10c78144232a2fb3a7579e2de3668c835d756ed6
2021-08-27[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: aec163e30bBill Yi
Blank merge reason: commit message contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/MusicFX/+/15688866 Change-Id: I36035779a1f9d9e32c7f4097e8bd4af49fc19b76
2021-08-27Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I4968bd79736b5b89eeef59e3c72e6c28276757e7
2021-03-30Remove need for bluetooth permissionandroid12-devEric Laurent
Use AudioManager.AudioPlaybackCallback to detect if music playback happens on headset or not. This is more reliable than the old method based on deprecated APIs and does not require the BLUETOOTH premission. Bug: 183500722 Test: make and play music with Youtube Music Change-Id: I9c29ea428599face23cd7b78e2d90efaade2db79
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 56d850d9e4 -s ↵Xin Li
ours am: 709fed4553 -s ours am skip reason: Change-Id Ib86d80f0150ed2072f1e4f68aaed6ab45a51050b with SHA-1 57c174cee1 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I136b96b0ee6b2a79951ced06a73e164ad238869d
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 56d850d9e4 -s oursXin Li
am skip reason: Change-Id Ib86d80f0150ed2072f1e4f68aaed6ab45a51050b with SHA-1 57c174cee1 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I99199db56b4f72f6e1196476c091a1eb90bf7e4a
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: ↵Bob Badour
e87ccc4e4f am: 68e8d95707 am: fae8d42bff Original change: https://android-review.googlesource.com/c/platform/packages/apps/MusicFX/+/1576198 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I7eac26fe73b63f4f712757a81bc098a360da604c
2021-02-05Merge "[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/MusicFX" am: ↵Bob Badour
e87ccc4e4f am: 68e8d95707 Original change: https://android-review.googlesource.com/c/platform/packages/apps/MusicFX/+/1576198 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I61da00b87b6e69d24ada5f15af6ecd06dc80c066
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: 331d3f4477 am: 57c174cee1Xin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/MusicFX/+/13113080 Change-Id: I5177eca41ce9e40279413098176e517ba0d8fff1
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: 865da37131 -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: Ief3e9ade5675a4004f4e9d0e82763081ecb5bc9e
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: ac76f6b16f -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: If53165a6a43a0a839743ecc279069d3197490628
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