aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Merge Android 12 QPR 3"Xin Li2022-06-161-1/+7
|\
| * Merge Android 12 QPR 3Xin Li2022-06-141-1/+7
|/| | | | | | | | | | | Bug: 236045730 Merged-In: I4df938df7886adc58185586190e27bcd16e17966 Change-Id: I14c070faf59e63c6fac783faf8f8f5ec41609c29
| * 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 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 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-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-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-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>
| | | | * | | | | | [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 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: I59120641fbf79d13ad4886c224e9fc90b71ca87f 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-060-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | transportDec_OutOfBandConfig() and skip re-allocation. am: c650c88c62 -s ours am: 76075bd4e5 -s ours am skip reason: Merged-In I64e7fe1b258be2f59c6d39c0b7b699fa881d79e6 with SHA-1 2768a078f3 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/17615050 Change-Id: I08268a900f00d5f72a27843f71cac70fcdba8838 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: c650c88c62 -s ours am skip reason: Merged-In I64e7fe1b258be2f59c6d39c0b7b699fa881d79e6 with SHA-1 2768a078f3 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/17615050 Change-Id: I188c5da3f9b47d51a2fc8bca78ad9c33a612359f 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
| | * | / / / / / [automerge] Reject invalid out of band config in ↵Fraunhofer IIS FDK2022-04-061-1/+7
| |/| | | | | | | | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | transportDec_OutOfBandConfig() and skip re-allocation. 2p: 2768a078f3 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/17615051 Bug: 224314979 Bug: 221734266 Change-Id: Id377e9ed3e293572c9f6feadbabdaa7ac66e0a6e Merged-In: I64e7fe1b258be2f59c6d39c0b7b699fa881d79e6
| | * / / / / / 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
| * | | | | | Merge "Add license_note" am: 3070cab376 am: 53c773b1ceTreehugger Robot2022-03-081-0/+4
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/external/aac/+/2011744 Change-Id: I264e8378920565bcaa08d057cbd262e1260a5a6f
| | * | | | | | Merge "Add license_note" am: 3070cab376Treehugger Robot2022-03-081-0/+4
| |/| | | | | | | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/external/aac/+/2011744 Change-Id: I21f518a6f6617cb68c06fc131e38ac3c0991f28a
* | | | | | | Merge "Add license_note"Treehugger Robot2022-03-081-0/+4
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Add license_noteBob Badour2022-03-071-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Comments not preserved during refresh. Bug: 68860345 Test: m nothing Change-Id: I46129df85a9242587621756be25d797bf90428d6
* | | | | | | Merge "Renamed bluetooth apex name to com.android.bluetooth" am: dd6d9f9f6c ↵Etienne Ruffieux2021-12-161-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 19aed5ca32 am: acbcc9b9f3 Original change: https://android-review.googlesource.com/c/platform/external/aac/+/1924424 Change-Id: Iff49e44b95b4c812cfedfe4de438fa081d8dc534
| * \ \ \ \ \ \ Merge "Renamed bluetooth apex name to com.android.bluetooth" am: dd6d9f9f6c ↵Etienne Ruffieux2021-12-161-1/+1
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 19aed5ca32 Original change: https://android-review.googlesource.com/c/platform/external/aac/+/1924424 Change-Id: I8f89b5cf299b92478fdeea4df43dcd1544ec4a6d
| | * | | | | | | Merge "Renamed bluetooth apex name to com.android.bluetooth" am: dd6d9f9f6cEtienne Ruffieux2021-12-161-1/+1
| |/| | | | | | | | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/external/aac/+/1924424 Change-Id: I86050beb93e24fa9fda8ad977b39429a1739316a
| | * | | | | | Merge "Renamed bluetooth apex name to com.android.bluetooth"Etienne Ruffieux2021-12-161-1/+1
| |/| | | | | |
| | * | | | | | Renamed bluetooth apex name to com.android.bluetoothEtienne Ruffieux2021-12-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Tag: #feature Bug: 206614050 Test: Compiles Change-Id: I938453612da6879a1bbb68adfecaaed1d5dc0a0c
* | | | | | | | [automerger skipped] Merge "Merge Android 12" am: 0bfa3fc1cd -s ours am: ↵Xin Li2021-10-080-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e5af18bbac -s ours am: 8174082796 -s ours am: 3a30e79d30 -s ours am skip reason: Merged-In Ia7a8fba7d5108dd4281a47b1aa15966bb6eee947 with SHA-1 a950cd9905 is already in history Original change: https://android-review.googlesource.com/c/platform/external/aac/+/1847533 Change-Id: I1c15a27d8a78adbe60ecbc1732457f42e5770cfb
| * | | | | | | [automerger skipped] Merge "Merge Android 12" am: 0bfa3fc1cd -s ours am: ↵Xin Li2021-10-080-0/+0
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e5af18bbac -s ours am: 8174082796 -s ours am skip reason: Merged-In Ia7a8fba7d5108dd4281a47b1aa15966bb6eee947 with SHA-1 a950cd9905 is already in history Original change: https://android-review.googlesource.com/c/platform/external/aac/+/1847533 Change-Id: Ia3216761d230815fb591350264c8799798e718d0
| | * \ \ \ \ \ \ [automerger skipped] Merge "Merge Android 12" am: 0bfa3fc1cd -s ours am: ↵Xin Li2021-10-080-0/+0
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e5af18bbac -s ours am skip reason: Merged-In Ia7a8fba7d5108dd4281a47b1aa15966bb6eee947 with SHA-1 a950cd9905 is already in history Original change: https://android-review.googlesource.com/c/platform/external/aac/+/1847533 Change-Id: Idab883eab066d41db00ca29f8c7532e18de5ff06
| | | * | | | | | | [automerger skipped] Merge "Merge Android 12" am: 0bfa3fc1cd -s oursXin Li2021-10-080-0/+0
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am skip reason: Merged-In Ia7a8fba7d5108dd4281a47b1aa15966bb6eee947 with SHA-1 a950cd9905 is already in history Original change: https://android-review.googlesource.com/c/platform/external/aac/+/1847533 Change-Id: I0a9c8548d6610f1f3d719b41c21bd40591a29673
| | | | * | | | | | Merge "Merge Android 12"Xin Li2021-10-0748-822/+1161
| | | | |\ \ \ \ \ \
| | | | | * | | | | | Merge Android 12Xin Li2021-10-0648-822/+1161
| | | | |/| | | | | | | | | | |/ / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 202323961 Merged-In: Ia7a8fba7d5108dd4281a47b1aa15966bb6eee947 Change-Id: Iebff00b0ddec06e5d43a6f0109325613701dc05d
* | | | | | | | | | [automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: ↵Xin Li2021-08-170-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a950cd9905 -s ours am: 472cef1b5e -s ours am: d327f4f001 -s ours am skip reason: Merged-In I18d2a0819145e1f02c8868674eab081ab243f0a9 with SHA-1 dcb2d8bd81 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/15567335 Change-Id: Ie7bbc6582a27a2fde3560a02d1f124418fdea0c7
| * | | | | | | | | [automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: ↵Xin Li2021-08-170-0/+0
|/| | | | | | | | | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a950cd9905 -s ours am: 472cef1b5e -s ours am skip reason: Merged-In I18d2a0819145e1f02c8868674eab081ab243f0a9 with SHA-1 dcb2d8bd81 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/15567335 Change-Id: Ic2f02ed8fd742c45860ecc2989fb060233d6701c
| * / / / / / / / [automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: ↵Xin Li2021-08-170-0/+0
|/| | | | | | | | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a950cd9905 -s ours am skip reason: Merged-In I18d2a0819145e1f02c8868674eab081ab243f0a9 with SHA-1 dcb2d8bd81 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/15567335 Change-Id: Ic566c9da8ba56244997e125548f2b643708054d1
| * | | | | | | Merge sc-dev-plus-aosp-without-vendor@7634622Xin Li2021-08-1448-822/+1161
| |\ \ \ \ \ \ \ | |/ / / / / / / |/| / / / / / / | |/ / / / / / | | | | | | | Merged-In: I18d2a0819145e1f02c8868674eab081ab243f0a9 Change-Id: Ia7a8fba7d5108dd4281a47b1aa15966bb6eee947
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-11 19:49:45 +0000