aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "[Bluetooth apex] Use new apex name" am: f9820781d9Treehugger Robot2022-08-231-1/+1
|\ | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/external/aac/+/2192087 Change-Id: Iaea278a4c8c276598c1d9d7b6a6495a2faad0591 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| * Merge "[Bluetooth apex] Use new apex name"Treehugger Robot2022-08-231-1/+1
|/|
| * [Bluetooth apex] Use new apex nameWilliam Escande2022-08-221-1/+1
|/ | | | | | | | The Bluetooth apex name is now called com.android.btservices Bug: 243054261 Test: Build Change-Id: I504a8727ddf73d3568616bc0f57983331dd28744
* Merge "DO NOT MERGE - Skip SQ3A.220605.009" am: 2231acfd62 am: 8f53fdaaa6Treehugger Robot2022-06-170-0/+0
|\ | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/external/aac/+/2128078 Change-Id: I17ca4d9dc314d0b286708b079cdb9464be99e942 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| * Merge "DO NOT MERGE - Skip SQ3A.220605.009" am: 2231acfd62Treehugger Robot2022-06-170-0/+0
| |\ | | | | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/external/aac/+/2128078 Change-Id: If09f84637bfd45a2ded9516104de2e7ae520d402 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| | * Merge "DO NOT MERGE - Skip SQ3A.220605.009"Treehugger Robot2022-06-170-0/+0
| | |\
* | | | DO NOT MERGE - Skip SQ3A.220605.009 am: bc7c5b55b5 am: 181d0ef5e2Xin Li2022-06-170-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/external/aac/+/2128078 Change-Id: I5e56b7dd29b51efb2fb330832f7b990d5f735408 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| * | | DO NOT MERGE - Skip SQ3A.220605.009 am: bc7c5b55b5Xin Li2022-06-170-0/+0
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/external/aac/+/2128078 Change-Id: I5cf15e7b63c5874ada7ec110523d5f1e2bb83157 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| | * | DO NOT MERGE - Skip SQ3A.220605.009Xin Li2022-06-160-0/+0
| | |\ \ | | | |/ | | |/| | | | | | | | | | | | | Bug: 236045730 Merged-In: I64e7fe1b258be2f59c6d39c0b7b699fa881d79e6 Change-Id: Ie0ca07f0aa6ea25a02e3702745c1ab1b6fd55bc9
| | | * Snap for 8417597 from f02e2ba58f6c161ea1792ed180242ba7d6b849e0 to ↵Android Build Coastguard Worker2022-04-071-1/+7
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | sc-qpr3-release Change-Id: Iede59048bfac7adc5daa9359fed3c2295873637c
* | | | | [automerger skipped] Merge "Merge Android 12 QPR 3" am: cb00f5235d -s ours ↵Xin Li2022-06-170-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 5ccfd6ac78 -s ours am skip reason: Merged-In I4df938df7886adc58185586190e27bcd16e17966 with SHA-1 1f830f7196 is already in history Original change: https://android-review.googlesource.com/c/platform/external/aac/+/2126004 Change-Id: Ic35150ce86342d8abe9bfc0f77c0b255c3ec7d42 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| * | | | [automerger skipped] Merge "Merge Android 12 QPR 3" am: cb00f5235d -s oursXin Li2022-06-160-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am skip reason: Merged-In I4df938df7886adc58185586190e27bcd16e17966 with SHA-1 1f830f7196 is already in history Original change: https://android-review.googlesource.com/c/platform/external/aac/+/2126004 Change-Id: I7881f686f3011850e299efde8c2588f5d7ceaff6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| | * | | Merge "Merge Android 12 QPR 3"Xin Li2022-06-161-1/+7
| | |\ \ \
* | | | | | [automerger skipped] Merge Android 12 QPR 3 am: 0ace73f2d3 -s ours am: ↵Xin Li2022-06-170-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3c9fe29541 -s ours am skip reason: Merged-In I4df938df7886adc58185586190e27bcd16e17966 with SHA-1 1f830f7196 is already in history Original change: https://android-review.googlesource.com/c/platform/external/aac/+/2126004 Change-Id: I9f4e52edb80ba867982c657f12f79b2fe2a17e3e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| * | | | | [automerger skipped] Merge Android 12 QPR 3 am: 0ace73f2d3 -s oursXin Li2022-06-160-0/+0
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am skip reason: Merged-In I4df938df7886adc58185586190e27bcd16e17966 with SHA-1 1f830f7196 is already in history Original change: https://android-review.googlesource.com/c/platform/external/aac/+/2126004 Change-Id: If8b5a0cf1530fd8f49ceda4fd767bf4f67827e1d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| | * | | | Merge Android 12 QPR 3Xin Li2022-06-141-1/+7
| | |\ \ \ \ | | |/ / / / | |/| / / / | | |/ / / | | | | | | | | | | Bug: 236045730 Merged-In: I4df938df7886adc58185586190e27bcd16e17966 Change-Id: I14c070faf59e63c6fac783faf8f8f5ec41609c29
* | | | | [automerger skipped] Merge sc-v2-dev-plus-aosp-without-vendor@8433047 am: ↵Xin Li2022-04-200-0/+0
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1f830f7196 -s ours am: 456ba9e186 -s ours am skip reason: Merged-In I64e7fe1b258be2f59c6d39c0b7b699fa881d79e6 with SHA-1 23ef1ac38c is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/17805627 Change-Id: I5681a91da0fd07d4d7d63c2121b614f209aefada Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| * | | | | [automerger skipped] Merge sc-v2-dev-plus-aosp-without-vendor@8433047 am: ↵Xin Li2022-04-190-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1f830f7196 -s ours am skip reason: Merged-In I64e7fe1b258be2f59c6d39c0b7b699fa881d79e6 with SHA-1 23ef1ac38c is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/17805627 Change-Id: I3fcfa21a61f634331f58d03e3a11fc0ec8953192 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| | * | | | Merge sc-v2-dev-plus-aosp-without-vendor@8433047Xin Li2022-04-181-1/+7
| | |\ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | Bug: 226662282 Merged-In: I64e7fe1b258be2f59c6d39c0b7b699fa881d79e6 Change-Id: I4df938df7886adc58185586190e27bcd16e17966
* | | | | | [automerger skipped] Reject invalid out of band config in ↵Fraunhofer IIS FDK2022-04-070-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | transportDec_OutOfBandConfig() and skip re-allocation. am: eb07c22519 am: 2b57d2b0be -s ours am: 16585e6174 -s ours am: 8c56a3bf71 -s ours am: 8b6f2f0af5 -s ours am: 4942ddcaac -s ours am: f02e2ba58f -s ours am: e72924914c -s ours am skip reason: Merged-In I64e7fe1b258be2f59c6d39c0b7b699fa881d79e6 with SHA-1 6a3817573b is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/17615048 Change-Id: I620d85b4660c8c54cb9cca32278bace0f7f8495b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| * | | | | [automerger skipped] Reject invalid out of band config in ↵Fraunhofer IIS FDK2022-04-070-0/+0
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | transportDec_OutOfBandConfig() and skip re-allocation. am: eb07c22519 am: 2b57d2b0be -s ours am: 16585e6174 -s ours am: 8c56a3bf71 -s ours am: 8b6f2f0af5 -s ours am: 4942ddcaac -s ours am: f02e2ba58f -s ours am skip reason: Merged-In I64e7fe1b258be2f59c6d39c0b7b699fa881d79e6 with SHA-1 6a3817573b is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/17615048 Change-Id: I58f79bbd56888233a5d4e80f55db0c12fd4245e4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| | * | | | [automerger skipped] Reject invalid out of band config in ↵Fraunhofer IIS FDK2022-04-070-0/+0
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | transportDec_OutOfBandConfig() and skip re-allocation. am: eb07c22519 am: 2b57d2b0be -s ours am: 16585e6174 -s ours am: 8c56a3bf71 -s ours am: 8b6f2f0af5 -s ours am: 4942ddcaac -s ours am skip reason: Merged-In I64e7fe1b258be2f59c6d39c0b7b699fa881d79e6 with SHA-1 6a3817573b is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/17615048 Change-Id: Ieacfcbb28bd8f356162a8d3cc92a350a2d03f0b6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| | | * \ \ \ [automerger skipped] Reject invalid out of band config in ↵Fraunhofer IIS FDK2022-04-070-0/+0
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | transportDec_OutOfBandConfig() and skip re-allocation. am: eb07c22519 am: 2b57d2b0be -s ours am: 16585e6174 -s ours am: 8c56a3bf71 -s ours am: 8b6f2f0af5 -s ours am skip reason: Merged-In I64e7fe1b258be2f59c6d39c0b7b699fa881d79e6 with SHA-1 6a3817573b is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/17615048 Change-Id: I34e3e3c3d56c7ad92d0619abcc160f77c0487dd9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
* | | | \ \ \ \ [automerger skipped] Reject invalid out of band config in ↵Fraunhofer IIS FDK2022-04-070-0/+0
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | transportDec_OutOfBandConfig() and skip re-allocation. am: eb07c22519 am: 2b57d2b0be -s ours am: 16585e6174 -s ours am: 8c56a3bf71 -s ours am: 8b6f2f0af5 -s ours am: 87ad6b892f -s ours am skip reason: Merged-In I64e7fe1b258be2f59c6d39c0b7b699fa881d79e6 with SHA-1 6a3817573b is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/17615048 Change-Id: I427569d2b8d9e9d91456219fc11352e319024e1e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| * \ \ \ \ \ \ \ [automerger skipped] Reject invalid out of band config in ↵Fraunhofer IIS FDK2022-04-070-0/+0
| |\ \ \ \ \ \ \ \ | | | |_|_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | transportDec_OutOfBandConfig() and skip re-allocation. am: eb07c22519 am: 2b57d2b0be -s ours am: 16585e6174 -s ours am: 8c56a3bf71 -s ours am: 8b6f2f0af5 -s ours am skip reason: Merged-In I64e7fe1b258be2f59c6d39c0b7b699fa881d79e6 with SHA-1 6a3817573b is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/17615048 Change-Id: I85027c16c682104915271362d23763dd91cca9c8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| | * | | | | | | [automerger skipped] Reject invalid out of band config in ↵Fraunhofer IIS FDK2022-04-070-0/+0
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | transportDec_OutOfBandConfig() and skip re-allocation. am: eb07c22519 am: 2b57d2b0be -s ours am: 16585e6174 -s ours am: 8c56a3bf71 -s ours am skip reason: Merged-In I64e7fe1b258be2f59c6d39c0b7b699fa881d79e6 with SHA-1 6a3817573b is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/17615048 Change-Id: I46baa1df38066d55b0c8ba13de4a8587e189f788 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| | | * \ \ \ \ \ \ [automerger skipped] Reject invalid out of band config in ↵Fraunhofer IIS FDK2022-04-070-0/+0
| | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | transportDec_OutOfBandConfig() and skip re-allocation. am: eb07c22519 am: 2b57d2b0be -s ours am: 16585e6174 -s ours am skip reason: Merged-In I64e7fe1b258be2f59c6d39c0b7b699fa881d79e6 with SHA-1 6a3817573b is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/17615048 Change-Id: Ife0ac184822af69a6640cc0a01783259b290679b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| | | | * \ \ \ \ \ \ [automerger skipped] Reject invalid out of band config in ↵Fraunhofer IIS FDK2022-04-060-0/+0
| | | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | transportDec_OutOfBandConfig() and skip re-allocation. am: eb07c22519 am: 2b57d2b0be -s ours am skip reason: Merged-In I64e7fe1b258be2f59c6d39c0b7b699fa881d79e6 with SHA-1 6a3817573b is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/17615048 Change-Id: Ia1d76d35fde1175b5bcda3669b1c8b0fe76a717d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| | | | | * \ \ \ \ \ \ Reject invalid out of band config in transportDec_OutOfBandConfig() and skip ↵Fraunhofer IIS FDK2022-04-061-1/+7
| | | | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | re-allocation. am: eb07c22519 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/17615048 Change-Id: I483ed144764b68840a5ee6463f1db927fe174ae7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| | | | | | * | | | | | | Reject invalid out of band config in transportDec_OutOfBandConfig() and skip ↵Fraunhofer IIS FDK2022-04-061-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | re-allocation. Bug: 224314979 Bug: 221734266 Test: adb shell /data/fuzz/arm64/C2FuzzerAacDec/C2FuzzerAacDec /data/local/tmp/clusterfuzz-testcase-minimized-C2FuzzerAacDec-5461414938804224 Test: adb shell /data/fuzz/arm64/C2FuzzerAacDec/C2FuzzerAacDec /data/local/tmp/clusterfuzz-testcase-minimized-C2FuzzerAacDec-5062403589275648 Change-Id: I64e7fe1b258be2f59c6d39c0b7b699fa881d79e6 Merged-In: I64e7fe1b258be2f59c6d39c0b7b699fa881d79e6
* | | | | | | | | | | | | [automerger skipped] Reject invalid out of band config in ↵Fraunhofer IIS FDK2022-04-070-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | transportDec_OutOfBandConfig() and skip re-allocation. am: 6a3817573b -s ours am: 156794b105 -s ours am: f95792e18c -s ours am: 1193b11357 -s ours am skip reason: Merged-In I64e7fe1b258be2f59c6d39c0b7b699fa881d79e6 with SHA-1 b297bcbf2a is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/17615049 Change-Id: Ifc31f69df19dcc12a5dfef24679b6d106e09cb01 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| * | | | | | | | | | | | [automerger skipped] Reject invalid out of band config in ↵Fraunhofer IIS FDK2022-04-060-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | transportDec_OutOfBandConfig() and skip re-allocation. am: 6a3817573b -s ours am: 156794b105 -s ours am: f95792e18c -s ours am skip reason: Merged-In I64e7fe1b258be2f59c6d39c0b7b699fa881d79e6 with SHA-1 b297bcbf2a is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/17615049 Change-Id: Ib3e00e6f19f7bbf83c745e8caff6853fa48f4453 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
* | | | | | | | | | | | | [automerger skipped] Reject invalid out of band config in ↵Fraunhofer IIS FDK2022-04-070-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | transportDec_OutOfBandConfig() and skip re-allocation. am: b297bcbf2a -s ours am: 6b001a123c -s ours am: 2c6782ab76 -s ours am skip reason: Merged-In I64e7fe1b258be2f59c6d39c0b7b699fa881d79e6 with SHA-1 23ef1ac38c is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/17614692 Change-Id: I5e14f4633e54ae13400b3e91692af09113f449f6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| * | | | | | | | | | | | [automerger skipped] Reject invalid out of band config in ↵Fraunhofer IIS FDK2022-04-060-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | transportDec_OutOfBandConfig() and skip re-allocation. am: b297bcbf2a -s ours am: 6b001a123c -s ours am skip reason: Merged-In I64e7fe1b258be2f59c6d39c0b7b699fa881d79e6 with SHA-1 23ef1ac38c is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/17614692 Change-Id: I9de914da031fcec5f531652cb7a54ec4b509e4db Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
* | \ \ \ \ \ \ \ \ \ \ \ \ [automerger skipped] Reject invalid out of band config in ↵Fraunhofer IIS FDK2022-04-070-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | transportDec_OutOfBandConfig() and skip re-allocation. am: 6a3817573b -s ours am: 156794b105 -s ours am: f95792e18c -s ours am: 0ad5135377 -s ours am: d5de58e395 -s ours am: b5b3b3c0a2 -s ours am skip reason: Merged-In I64e7fe1b258be2f59c6d39c0b7b699fa881d79e6 with SHA-1 b297bcbf2a is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/17615049 Change-Id: I609baf5eaa6ed558affba5a988d65b929369a5e3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| * | | | | | | | | | | | | [automerger skipped] Reject invalid out of band config in ↵Fraunhofer IIS FDK2022-04-060-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | transportDec_OutOfBandConfig() and skip re-allocation. am: 6a3817573b -s ours am: 156794b105 -s ours am: f95792e18c -s ours am: 0ad5135377 -s ours am: d5de58e395 -s ours am skip reason: Merged-In I64e7fe1b258be2f59c6d39c0b7b699fa881d79e6 with SHA-1 b297bcbf2a is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/17615049 Change-Id: Ib9306e120fc4117ea18f0c8a6039ca461df5acb7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| | * | | | | | | | | | | | [automerger skipped] Reject invalid out of band config in ↵Fraunhofer IIS FDK2022-04-060-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|/ / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | transportDec_OutOfBandConfig() and skip re-allocation. am: 6a3817573b -s ours am: 156794b105 -s ours am: f95792e18c -s ours am: 0ad5135377 -s ours am skip reason: Merged-In I64e7fe1b258be2f59c6d39c0b7b699fa881d79e6 with SHA-1 b297bcbf2a is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/17615049 Change-Id: Id687212c011e695880d23974f25080452c4cf002 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| | | * | | | | | | | | | | [automerger skipped] Reject invalid out of band config in ↵Fraunhofer IIS FDK2022-04-060-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | |_|/ / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | transportDec_OutOfBandConfig() and skip re-allocation. am: 6a3817573b -s ours am: 156794b105 -s ours am: f95792e18c -s ours am skip reason: Merged-In I64e7fe1b258be2f59c6d39c0b7b699fa881d79e6 with SHA-1 b297bcbf2a is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/17615049 Change-Id: If518b274a207500bc53d1a7566d76339e3afcbf5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| | | | * | | | | | | | | | [automerger skipped] Reject invalid out of band config in ↵Fraunhofer IIS FDK2022-04-060-0/+0
| | | | |\ \ \ \ \ \ \ \ \ \ | | | | | |_|/ / / / / / / / | | | | |/| | / / / / / / / | | | | | | |/ / / / / / / | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | transportDec_OutOfBandConfig() and skip re-allocation. am: 6a3817573b -s ours am: 156794b105 -s ours am skip reason: Merged-In I64e7fe1b258be2f59c6d39c0b7b699fa881d79e6 with SHA-1 b297bcbf2a is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/17615049 Change-Id: I5888c51c770184ab3349f3e0c90eeccb19f5f47b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| | | | | * | | | | | | | [automerger skipped] Reject invalid out of band config in ↵Fraunhofer IIS FDK2022-04-060-0/+0
| | | | | |\ \ \ \ \ \ \ \ | | | | | | | |/ / / / / / | | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | transportDec_OutOfBandConfig() and skip re-allocation. am: 6a3817573b -s ours am skip reason: Merged-In I64e7fe1b258be2f59c6d39c0b7b699fa881d79e6 with SHA-1 b297bcbf2a is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/17615049 Change-Id: Ie0df904e14408f20118d07e9d416c27b52d2f908 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| | | | | | * | | | | | | Reject invalid out of band config in transportDec_OutOfBandConfig() and skip ↵Fraunhofer IIS FDK2022-04-061-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | re-allocation. Bug: 224314979 Bug: 221734266 Test: adb shell /data/fuzz/arm64/C2FuzzerAacDec/C2FuzzerAacDec /data/local/tmp/clusterfuzz-testcase-minimized-C2FuzzerAacDec-5461414938804224 Test: adb shell /data/fuzz/arm64/C2FuzzerAacDec/C2FuzzerAacDec /data/local/tmp/clusterfuzz-testcase-minimized-C2FuzzerAacDec-5062403589275648 Change-Id: I64e7fe1b258be2f59c6d39c0b7b699fa881d79e6 Merged-In: I64e7fe1b258be2f59c6d39c0b7b699fa881d79e6
* | | | | | | | | | | | | [automerger skipped] Reject invalid out of band config in ↵Fraunhofer IIS FDK2022-04-070-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | transportDec_OutOfBandConfig() and skip re-allocation. am: b297bcbf2a -s ours am: 6b001a123c -s ours am: 29f4827ef4 -s ours am: 9bfb60d7c4 -s ours am: 88d1e82df9 -s ours am skip reason: Merged-In I64e7fe1b258be2f59c6d39c0b7b699fa881d79e6 with SHA-1 23ef1ac38c is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/17614692 Change-Id: Ibefc5e3f9ab8972e3abf3e20647fce00612e2a64 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| * | | | | | | | | | | | [automerger skipped] Reject invalid out of band config in ↵Fraunhofer IIS FDK2022-04-060-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | transportDec_OutOfBandConfig() and skip re-allocation. am: b297bcbf2a -s ours am: 6b001a123c -s ours am: 29f4827ef4 -s ours am: 9bfb60d7c4 -s ours am skip reason: Merged-In I64e7fe1b258be2f59c6d39c0b7b699fa881d79e6 with SHA-1 23ef1ac38c is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/17614692 Change-Id: I3be6917066813802035854bcb6a744dc57d4984c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| | * | | | | | | | | | | [automerger skipped] Reject invalid out of band config in ↵Fraunhofer IIS FDK2022-04-060-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | transportDec_OutOfBandConfig() and skip re-allocation. am: b297bcbf2a -s ours am: 6b001a123c -s ours am: 29f4827ef4 -s ours am skip reason: Merged-In I64e7fe1b258be2f59c6d39c0b7b699fa881d79e6 with SHA-1 23ef1ac38c is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/17614692 Change-Id: I8d5ee3895733fa660cc096ee7cbf3f3ccdb2ff9c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| | | * | | | | | | | | | [automerger skipped] Reject invalid out of band config in ↵Fraunhofer IIS FDK2022-04-060-0/+0
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | transportDec_OutOfBandConfig() and skip re-allocation. am: b297bcbf2a -s ours am: 6b001a123c -s ours am skip reason: Merged-In I64e7fe1b258be2f59c6d39c0b7b699fa881d79e6 with SHA-1 23ef1ac38c is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/17614692 Change-Id: I6fed7db61ffe312199e9761be800dff1fbd80a9c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| | | | * | | | | | | | | [automerger skipped] Reject invalid out of band config in ↵Fraunhofer IIS FDK2022-04-060-0/+0
| | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | transportDec_OutOfBandConfig() and skip re-allocation. am: b297bcbf2a -s ours am skip reason: Merged-In I64e7fe1b258be2f59c6d39c0b7b699fa881d79e6 with SHA-1 23ef1ac38c is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/17614692 Change-Id: I5f682fc32640b62e99c3d27a52a707084f4d9699 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| | | | | * | | | | | | | Reject invalid out of band config in transportDec_OutOfBandConfig() and skip ↵Fraunhofer IIS FDK2022-04-061-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | re-allocation. Bug: 224314979 Bug: 221734266 Test: adb shell /data/fuzz/arm64/C2FuzzerAacDec/C2FuzzerAacDec /data/local/tmp/clusterfuzz-testcase-minimized-C2FuzzerAacDec-5461414938804224 Test: adb shell /data/fuzz/arm64/C2FuzzerAacDec/C2FuzzerAacDec /data/local/tmp/clusterfuzz-testcase-minimized-C2FuzzerAacDec-5062403589275648 Change-Id: I64e7fe1b258be2f59c6d39c0b7b699fa881d79e6 Merged-In: I64e7fe1b258be2f59c6d39c0b7b699fa881d79e6
* | | | | | | | | | | | | [automerger skipped] Reject invalid out of band config in ↵Fraunhofer IIS FDK2022-04-070-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | transportDec_OutOfBandConfig() and skip re-allocation. am: 23ef1ac38c -s ours am: f57a7c233f -s ours am: 96eb73f1d2 -s ours am: 70ac549da3 -s ours am skip reason: Merged-In I64e7fe1b258be2f59c6d39c0b7b699fa881d79e6 with SHA-1 c650c88c62 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/17615057 Change-Id: I319a6ffa8f09094f72244da01891842b45a68ddb Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| * | | | | | | | | | | | [automerger skipped] Reject invalid out of band config in ↵Fraunhofer IIS FDK2022-04-060-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | transportDec_OutOfBandConfig() and skip re-allocation. am: 23ef1ac38c -s ours am: f57a7c233f -s ours am: 96eb73f1d2 -s ours am skip reason: Merged-In I64e7fe1b258be2f59c6d39c0b7b699fa881d79e6 with SHA-1 c650c88c62 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/17615057 Change-Id: Iee254145cc580a97f8ac5ca7de149f87f332b916 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| | * | | | | | | | | | | [automerger skipped] Reject invalid out of band config in ↵Fraunhofer IIS FDK2022-04-060-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | transportDec_OutOfBandConfig() and skip re-allocation. am: 23ef1ac38c -s ours am: f57a7c233f -s ours am skip reason: Merged-In I64e7fe1b258be2f59c6d39c0b7b699fa881d79e6 with SHA-1 c650c88c62 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/17615057 Change-Id: I780c0ef89eff586ba5ad462d25527d5e1502c38f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>