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: I22eced19fa70bd5c0147a9a14bf3f3c8afd5afff Change-Id: Iae1b94147b67f22aadaf93ea0e92f62745b4c321
2024-03-06Merge "TEST_MAPPING: Move SonivoxTest to presubmit" into main am: aeb7cd93d5temp_319669529Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/sonivox/+/2989875 Change-Id: I22eced19fa70bd5c0147a9a14bf3f3c8afd5afff Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-06Merge "TEST_MAPPING: Move SonivoxTest to presubmit" into mainTreehugger Robot
2024-03-06TEST_MAPPING: Move SonivoxTest to presubmitHarish Mahendrakar
Bug: 304383609 Change-Id: Id6c035b98433d4354a1fc8380ec267485d4f20f3 Test: Treehugger
2024-01-30Merge "Enable unit tests in postsubmit" into main am: 0ff49cf903Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/sonivox/+/2935312 Change-Id: I410cc09c261cf9e20545127e5752fc964c4af4e7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-30Merge "Enable unit tests in postsubmit" into mainTreehugger Robot
2024-01-30Enable unit tests in postsubmitHarish Mahendrakar
After some time of running these in postsubmit, these will be changed to presubmit. - Added SonivoxTest to device-tests test suite - Also run bpfmt on test/Android.bp. Bug: 304383609 Test: atest SonivoxTest Change-Id: I44877607193e14531f1d87928fb7487ccaec3fdd
2023-10-05Merge "SonivoxTest: Use MediaPreparer to download test files" into main am: ↵Treehugger Robot
5e9ae01ee1 am: 40c2ce9eb4 am: 1570e53606 am: 8edbdb706e am: 1478f9b3a6 Original change: https://android-review.googlesource.com/c/platform/external/sonivox/+/2773024 Change-Id: Ib69763e6ea55bd462e23e0d2ee43fa57bb349740 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-04Merge "SonivoxTest: Use MediaPreparer to download test files" into main am: ↵Treehugger Robot
5e9ae01ee1 am: 40c2ce9eb4 am: 1570e53606 am: 8edbdb706e Original change: https://android-review.googlesource.com/c/platform/external/sonivox/+/2773024 Change-Id: I30a95818669532becde7937226da552b7c322361 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-04Merge "SonivoxTest: Use MediaPreparer to download test files" into main am: ↵Treehugger Robot
5e9ae01ee1 am: 40c2ce9eb4 am: 1570e53606 Original change: https://android-review.googlesource.com/c/platform/external/sonivox/+/2773024 Change-Id: Ia0c1dd7fbf92110de05d50cac645ea2e15bad927 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-04Merge "SonivoxTest: Use MediaPreparer to download test files" into main am: ↵Treehugger Robot
5e9ae01ee1 am: 40c2ce9eb4 Original change: https://android-review.googlesource.com/c/platform/external/sonivox/+/2773024 Change-Id: Idd602e6a80db8c1fd3fc6a31132bcbefc04dfa9e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-04Merge "SonivoxTest: Use MediaPreparer to download test files" into main am: ↵Treehugger Robot
5e9ae01ee1 Original change: https://android-review.googlesource.com/c/platform/external/sonivox/+/2773024 Change-Id: I907eaad6952bf83043be60d76bcf76459e7a4e3e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-04Merge "SonivoxTest: Use MediaPreparer to download test files" into mainTreehugger Robot
2023-10-04SonivoxTest: Use MediaPreparer to download test filesHarish Mahendrakar
Also, use the zip file from dl.google.com path. Bug: 298733419 Test: atest SonivoxTest Change-Id: I190fccd42ea9b1b8e2281a717c19ab26354a1e19
2022-08-17[automerger skipped] Merge "DO NOT MERGE - Merge Android 13" am: 64b009bd04 ↵android-14.0.0_r40android-14.0.0_r39android-14.0.0_r38android-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_r19android-14.0.0_r18android-14.0.0_r17android-14.0.0_r16aml_rkp_341510000aml_rkp_341311000aml_rkp_341114000aml_rkp_341015010aml_rkp_341012000aml_hef_341613000aml_hef_341512030aml_hef_341415040aml_hef_341311010aml_hef_341114030aml_cfg_341510000android14-qpr1-s2-releaseandroid14-qpr1-releaseandroid14-mainline-healthfitness-releaseandroid14-devandroid14-d2-s1-releaseXin Li
-s ours am: 7c4dc1b5fb -s ours am: 0d30629bb4 -s ours am: 35ad21feed -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/external/sonivox/+/2186423 Change-Id: I2c7b11226dbb60a8691cf58ee5908c34d345e10d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-17[automerger skipped] DO NOT MERGE - Merge Android 13 am: c7858204da -s ours ↵Xin Li
am: 40dfebabcb -s ours am: 2b3140fd90 -s ours am: 08c4a9b447 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/external/sonivox/+/2186423 Change-Id: Iff195fc0258ca6e61f317da1fdca87b0b5f65e17 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-16[automerger skipped] Merge "DO NOT MERGE - Merge Android 13" am: 64b009bd04 ↵android-u-beta-1-gplmain-16k-with-phonesXin Li
-s ours am: 7c4dc1b5fb -s ours am: 0d30629bb4 -s ours am skip reason: Merged-In I61ac054c32525b8509baafd70840fbed0f1ab7c4 with SHA-1 196cde7bf2 is already in history Original change: https://android-review.googlesource.com/c/platform/external/sonivox/+/2186423 Change-Id: I099d4dfc8cdb400cdc8d1d5cdab6f2c5518f5ec3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-16[automerger skipped] DO NOT MERGE - Merge Android 13 am: c7858204da -s ours ↵Xin Li
am: 40dfebabcb -s ours am: 2b3140fd90 -s ours am skip reason: Merged-In I61ac054c32525b8509baafd70840fbed0f1ab7c4 with SHA-1 196cde7bf2 is already in history Original change: https://android-review.googlesource.com/c/platform/external/sonivox/+/2186423 Change-Id: I7616cf9fc342ffe1f5834d28c6a4e0b67637ee7f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-16[automerger skipped] Merge "DO NOT MERGE - Merge Android 13" am: 64b009bd04 ↵Xin Li
-s ours am: 7c4dc1b5fb -s ours am skip reason: Merged-In I61ac054c32525b8509baafd70840fbed0f1ab7c4 with SHA-1 196cde7bf2 is already in history Original change: https://android-review.googlesource.com/c/platform/external/sonivox/+/2186423 Change-Id: I3339f9f3033841f9944ea26382938c5d9b50e3a8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-16[automerger skipped] DO NOT MERGE - Merge Android 13 am: c7858204da -s ours ↵Xin Li
am: 40dfebabcb -s ours am skip reason: Merged-In I61ac054c32525b8509baafd70840fbed0f1ab7c4 with SHA-1 196cde7bf2 is already in history Original change: https://android-review.googlesource.com/c/platform/external/sonivox/+/2186423 Change-Id: I2a9fad0a47dcecbafb6b9b75886483c234cf7738 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-16[automerger skipped] Merge "DO NOT MERGE - Merge Android 13" am: 64b009bd04 ↵Xin Li
-s ours am skip reason: Merged-In I61ac054c32525b8509baafd70840fbed0f1ab7c4 with SHA-1 196cde7bf2 is already in history Original change: https://android-review.googlesource.com/c/platform/external/sonivox/+/2186423 Change-Id: I89d1c982667c7111a0726aac21d385bf7ef3eb68 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-16[automerger skipped] DO NOT MERGE - Merge Android 13 am: c7858204da -s oursXin Li
am skip reason: Merged-In I61ac054c32525b8509baafd70840fbed0f1ab7c4 with SHA-1 196cde7bf2 is already in history Original change: https://android-review.googlesource.com/c/platform/external/sonivox/+/2186423 Change-Id: Ife046100ce4aa307f4cc111f1e2b1b634c6fcaf1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-16Merge "DO NOT MERGE - Merge Android 13"main-16kXin Li
2022-08-15DO NOT MERGE - Merge Android 13Xin Li
Bug: 242648940 Merged-In: I61ac054c32525b8509baafd70840fbed0f1ab7c4 Change-Id: I6de8a8956f5701d3b8b98be77c6794d2ae26dfa3
2022-06-30[automerger skipped] Merge tm-dev-plus-aosp-without-vendor@8763363 am: ↵Xin Li
76858887c4 -s ours am: e1ac9d669a -s ours am: 56b3045d25 -s ours am: 8cebc43bc9 -s ours am skip reason: Merged-In I61ac054c32525b8509baafd70840fbed0f1ab7c4 with SHA-1 196cde7bf2 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/sonivox/+/19094691 Change-Id: I102ee5ea6dd5dc96905b59429863b83794fe589c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-30[automerger skipped] Merge tm-dev-plus-aosp-without-vendor@8763363 am: ↵Xin Li
76858887c4 -s ours am: e1ac9d669a -s ours am: 56b3045d25 -s ours am skip reason: Merged-In I61ac054c32525b8509baafd70840fbed0f1ab7c4 with SHA-1 196cde7bf2 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/sonivox/+/19094691 Change-Id: I5b2521c7acf12d32f544ecf66821a8fc56d300b4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-29[automerger skipped] Merge tm-dev-plus-aosp-without-vendor@8763363 am: ↵Xin Li
76858887c4 -s ours am: e1ac9d669a -s ours am skip reason: Merged-In I61ac054c32525b8509baafd70840fbed0f1ab7c4 with SHA-1 196cde7bf2 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/sonivox/+/19094691 Change-Id: I9c4b6bb55003fe5fcb0cfb35820112acf015fecd Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-29[automerger skipped] Merge tm-dev-plus-aosp-without-vendor@8763363 am: ↵Xin Li
76858887c4 -s ours am skip reason: Merged-In I61ac054c32525b8509baafd70840fbed0f1ab7c4 with SHA-1 196cde7bf2 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/sonivox/+/19094691 Change-Id: I443546d81ccf606fb29bdb38107639d37b0517cc Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-27Merge tm-dev-plus-aosp-without-vendor@8763363temp_sam_242648940Xin Li
Bug: 236760014 Merged-In: I61ac054c32525b8509baafd70840fbed0f1ab7c4 Change-Id: I4afc128626afd53768165344c07e64f55fc7dd87
2022-05-19Merge "Fix misleading indentation." am: 1e7ea9068a am: bc685c9b6b am: ↵Elliott Hughes
31eed4fa43 am: e7875f225f am: 2ae6eee375 Original change: https://android-review.googlesource.com/c/platform/external/sonivox/+/2100699 Change-Id: If60cebc44d66b3431c8fb6ca049ef3cb85583a0e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-18Merge "Fix misleading indentation." am: 1e7ea9068a am: bc685c9b6b am: ↵Elliott Hughes
31eed4fa43 am: e7875f225f Original change: https://android-review.googlesource.com/c/platform/external/sonivox/+/2100699 Change-Id: I35b356a135726a4faf4b8220deba1b8a3448e60b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-18Merge "Fix misleading indentation." am: 1e7ea9068a am: bc685c9b6b am: 31eed4fa43Elliott Hughes
Original change: https://android-review.googlesource.com/c/platform/external/sonivox/+/2100699 Change-Id: I494c1fdd733c22ff2c7efddd24da7fea31621b58 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-18Merge "Fix misleading indentation." am: 1e7ea9068a am: bc685c9b6bElliott Hughes
Original change: https://android-review.googlesource.com/c/platform/external/sonivox/+/2100699 Change-Id: I09f42f9128bfa73d9af5b581b4f909fba22a292f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-18Merge "Fix misleading indentation." am: 1e7ea9068aElliott Hughes
Original change: https://android-review.googlesource.com/c/platform/external/sonivox/+/2100699 Change-Id: I137326a9a17acec83ccdc95dc375e2cefdcdec80 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-18Merge "Fix misleading indentation."Elliott Hughes
2022-05-18Fix misleading indentation.Elliott Hughes
There isn't actually a bug here, but we'd like to turn -Wmisleading-indentation on. My understanding is that -- despite this being in external/ -- we are actually the upstream for sonivox anyway, hence the fix. Test: treehugger Change-Id: I61ac054c32525b8509baafd70840fbed0f1ab7c4
2022-05-13DLS: fix loop calculation for 16-bit am: 97f70ed81d am: a59fc47399 am: ↵Phil Burk
b8abe7e923 am: a8e229e96f Original change: https://googleplex-android-review.googlesource.com/c/platform/external/sonivox/+/18349826 Change-Id: I8420a93145104a23852a1121bfec2cfe1dfd6508 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-13DLS: fix loop calculation for 16-bit am: 97f70ed81d am: 4f077e4de6 am: ↵Phil Burk
e4bfb6ae2e am: 54060cd16e Original change: https://googleplex-android-review.googlesource.com/c/platform/external/sonivox/+/18349826 Change-Id: I011cca8fd26a299d99f33a5eee2ada586465d469 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-13DLS: fix loop calculation for 16-bit am: 97f70ed81d am: 4f077e4de6 am: ↵Phil Burk
1d91606a62 am: f0d88e9aa5 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/sonivox/+/18349826 Change-Id: Ie44c03d71299c83a6d8a7ed49e7bc2406ba20d5a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12DLS: fix loop calculation for 16-bit am: 97f70ed81d am: a59fc47399 am: ↵Phil Burk
b8abe7e923 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/sonivox/+/18349826 Change-Id: I5deb47a22c12caa4c469f1329dbed84e1371494e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12DLS: fix loop calculation for 16-bit am: 97f70ed81d am: 4f077e4de6 am: ↵Phil Burk
e4bfb6ae2e Original change: https://googleplex-android-review.googlesource.com/c/platform/external/sonivox/+/18349826 Change-Id: Ie63b7235bf09a0b7460722a559a4e74fdd3e4b29 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12DLS: fix loop calculation for 16-bit am: 97f70ed81d am: 4f077e4de6 am: ↵Phil Burk
1d91606a62 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/sonivox/+/18349826 Change-Id: If6bd4cf6d235109e40c6ebbb1239bed11a1aa80e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12DLS: fix loop calculation for 16-bit am: 97f70ed81d am: a59fc47399Phil Burk
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/sonivox/+/18349826 Change-Id: Ifee952430a7d36a5d64303da8734732acaca8841 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12DLS: fix loop calculation for 16-bit am: 97f70ed81d am: 4f077e4de6Phil Burk
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/sonivox/+/18349826 Change-Id: I92f3199230df41dba47ca3d7ba1493bb44667e6b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12DLS: fix loop calculation for 16-bit am: 97f70ed81d am: 4f077e4de6android-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_r56android-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_r32android13-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-d4-s2-releaseandroid13-d4-s1-releaseandroid13-d4-releasePhil Burk
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/sonivox/+/18349826 Change-Id: I3856bb543c15d1ddbf184f3802e006762362a3d7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12DLS: fix loop calculation for 16-bit am: 97f70ed81d am: ff2ab4d706Phil Burk
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/sonivox/+/18349826 Change-Id: I8c4d636bb2389c6ece1562125a7e493485713a98 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12DLS: fix loop calculation for 16-bit am: 97f70ed81dPhil Burk
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/sonivox/+/18349826 Change-Id: I8831c60af4b44fc70eeeb07b3008de4b1d5c9603 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12DLS: fix loop calculation for 16-bit am: 97f70ed81dPhil Burk
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/sonivox/+/18349826 Change-Id: I626a4ac639ea9449d125b37cc14ebd87932a6d27 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12DLS: fix loop calculation for 16-bit am: 97f70ed81dPhil Burk
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/sonivox/+/18349826 Change-Id: I84d8411e9bd0c6e5d59a4ddccf2f8a9ed15c2918 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>