aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | | | * | | | | | | [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>
| | | * | | | | | | | [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>
* | | | | | | | | | | [automerger skipped] Reject invalid out of band config in ↵Fraunhofer IIS FDK2022-04-070-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | transportDec_OutOfBandConfig() and skip re-allocation. am: c650c88c62 -s ours am: 76075bd4e5 -s ours am: 5a05a6a816 -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: I4a04f01ccb82aa7015b2c72953e7029b3c957e0f 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: 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
* | | | | | | | | | | [automerger skipped] [automerge] Reject invalid out of band config in ↵Fraunhofer IIS FDK2022-04-060-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | transportDec_OutOfBandConfig() and skip re-allocation. 2p: 2768a078f3 am: d787bdd639 -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/+/17615051 Change-Id: Ie699de60dc56fbb19dc4a9cd27c03235515df69f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| * | | | | | | | | | [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 changes from topic ↵Ray Essick2022-04-060-0/+0
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "presubmit-am-7d8337c3813a47e19898b70f395cf7ea-git_mainline-module-media_swcodec-release-rvc-qpr-dev-sc-dev" into tm-dev * changes: [automerge] Reject invalid out of band config in transportDec_OutOfBandConfig() and skip re-allocation. 2p: 23ef1ac38c 2p: 50d66655ca [automerge] Reject invalid out of band config in transportDec_OutOfBandConfig() and skip re-allocation. 2p: 23ef1ac38c Reject invalid out of band config in transportDec_OutOfBandConfig() and skip re-allocation.
| * \ \ \ \ \ \ \ \ [automerge] Reject invalid out of band config in ↵Fraunhofer IIS FDK2022-04-061-1/+7
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | transportDec_OutOfBandConfig() and skip re-allocation. 2p: 23ef1ac38c 2p: 50d66655ca Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/17615057 Bug: 224314979 Bug: 221734266 Change-Id: I41a977f7513be7f6df072011524a4870ac08dfab 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: 23ef1ac38c Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/17615057 Bug: 224314979 Bug: 221734266 Change-Id: I5ec75e235f096a4e8bd7e82ea3bf5f99353078af 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
* | | / | | | | | 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: 53c773b1ce am: 891e8c1f3aTreehugger Robot2022-03-081-0/+4
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/external/aac/+/2011744 Change-Id: Ia38ec1fc4507182ca045ecaacaa4e95b3ab900db
| * | | | | | | 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 am: 19f5de8354 Original change: https://android-review.googlesource.com/c/platform/external/aac/+/1924424 Change-Id: If5fcd63d06db469b8da9f9e896d1c435cf7c170b
| * | | | | | | | 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: 5cc7cec66e -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: Ic6a83a0fa660a67e3a15967a6824f55156f4b8b9
| * | | | | | | | | [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-180-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a950cd9905 -s ours am: 472cef1b5e -s ours am: d327f4f001 -s ours am: fec72c2c90 -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: I092764b5bf04ed177fed6883341036fdd193ce52
| * | | | | | | | | | | [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
* | | | | | | | | Merge sc-mainline-prodXin Li2021-06-020-0/+0
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 189946434 Change-Id: I2cb3cdc88d8b13af7d822e97ee6c5edccdeb7795
| * | | | | | | | Merge "Refine aacDecoder_DecodeFrame() output buffer parameter type ↵TreeHugger Robot2021-05-082-1/+1
| |\ \ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | description." into sc-dev am: d2c2a20682 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14471063 Change-Id: Iec55c398637d4906b7b89979c6292f9e26e012fe
| * | | | | | | | Merge "Adjust eqSubbandGainFormat data type to prevent load of invalid value ↵TreeHugger Robot2021-05-081-2/+2
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in _skipEqCoefficients()." into sc-dev am: 4a9bfbf730 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14471902 Change-Id: Id42fc123b39c431988b2549b56e9de12036a9020
| * \ \ \ \ \ \ \ \ Add parameter pointer check to aacEncInfo() encoder API function. am: c2416f5e93Fraunhofer IIS FDK2021-05-073-3/+8
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14471062 Change-Id: Iedde10c45bfcd36c647747d707babc44bfbe5730
| * \ \ \ \ \ \ \ \ \ Prevent too large shift exponent in apply_inter_tes() and merge two loops. ↵Fraunhofer IIS FDK2021-05-071-22/+9
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 2a40fde39d Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14471061 Change-Id: I585bba83fcd1fd2c288b20f492cb72e377533f56
| * \ \ \ \ \ \ \ \ \ \ Use scaleValuesSaturate() to avoid integer overflows in ↵Fraunhofer IIS FDK2021-05-071-33/+18
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QmfTransposerApply(). am: e5a14d0a33 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14471060 Change-Id: I033fc46b89137ad74135b36a3c2c9ccdf8de7bd4
| * \ \ \ \ \ \ \ \ \ \ \ Pass flushing flag to SBR module for stereo config index 3 as for stereo ↵Fraunhofer IIS FDK2021-05-071-1/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | config index 1 and 2. am: 92dd536642 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14470259 Change-Id: I28a19b03795f2e51b679fade211f959fe75460e6
| * \ \ \ \ \ \ \ \ \ \ \ \ Utilize dynamic scaling in slotAmp() to avoid signed integer overflows. am: ↵Fraunhofer IIS FDK2021-05-071-23/+54
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 56de8e29ce Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14470258 Change-Id: I3dd86141caa1d65bb08206b0a86e27b72ace37fd
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Adapt scaling in combineSignalCplxScale*() to prevent signed integer ↵Fraunhofer IIS FDK2021-05-071-15/+10
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | overflows. am: 773ff1d3e8 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14470257 Change-Id: I568446484ac45601e15980652490e8cf9fc386eb
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-10 08:01:41 +0000