aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Added installation procedureandimik2019-04-151-2/+14
|
* Merge remote-tracking branch 'mstorjo/master' into dabplus2Matthias P. Braendli2019-04-153-7/+15
|\
| * Merge remote-tracking branch 'aosp/master'Martin Storsjo2019-03-153-7/+15
| |\
| | * Merge "DO NOT MERGE - Merge PPRL.190205.001 into master"Xin Li2019-02-201-4/+4
| | |\
| | | * DO NOT MERGE - Merge PPRL.190205.001 into masterXin Li2019-02-181-4/+4
| | |/| | | | | | | | | | | | | | | | | Bug: 124234733 Change-Id: Ib53d396a2651013248e3f1a9f0bc68556f747274
| | | * DO NOT MERGE - Merge pi-platform-release (PPRL.190205.001) into ↵Xin Li2019-02-121-4/+4
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | stage-aosp-master Bug: 124234733 Change-Id: I7ed72a237fd7f0aa984b8077a369a1ddb5ba253b
| | | | * Snap for 5180536 from 75987acc798db1fe03002d04500dac994eb6d20c to ↵android-build-team Robot2019-02-091-4/+4
| | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pi-platform-release Change-Id: I5ebe5584689c6ac68fa82bef53068d114d4fc91f
| | | | | * Snap for 5066295 from 69514bb3082c0f26a3684501240c982b79ecc22b to ↵android-build-team Robot2018-10-120-0/+0
| | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pi-qpr2-release Change-Id: I918cab06ee2aa457d86fabb012484c2502762735
| | | | | | * [automerger skipped] Merge "Prevent out of bounds accesses in ↵Jean-Michel Trivi2018-10-120-0/+0
| | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lppTransposer()" into oc-dev am: 5a025c4fea am: 1c4c4a8c97 am: 0ff211e4fb -s ours Change-Id: I4355b82503373ae3858a4f374ba62bbf923566ec
| | | | | | | * Merge "Prevent out of bounds accesses in lppTransposer()" into oc-dev am: ↵Jean-Michel Trivi2018-10-122-13/+27
| | | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5a025c4fea am: 1c4c4a8c97 Change-Id: I547a825e0a48ef9f3c48b29ea2443f9945da52a2
| | | | | | | | * Merge "Prevent out of bounds accesses in lppTransposer()" into oc-devJean-Michel Trivi2018-10-122-13/+27
| | | | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 5a025c4fea Change-Id: I9011199b747a45a4cae8214b2e4b7b1f158ac1bc
| | | | | | | | | * Merge "Prevent out of bounds accesses in lppTransposer()" into oc-devTreeHugger Robot2018-10-122-13/+27
| | | | | | | | | |\
| | | | | | | | | | * Prevent out of bounds accesses in lppTransposer()Jean-Michel Trivi2018-10-112-13/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Check validity of pSettings->noOfPatches to prevent out of bounds access in lppTransposer(), which can also cause memSize to be negative. Bug: 112160868 Test: see poc in bug Change-Id: I789030b116da7f8ea261001b43ef6c677dd58a3d Merged-In: I6a2161865d9cb9b51dc37c09d6e3a4a8e5d11f86
| | | | | | * | | | | [automerger skipped] [automerger] DO NOT MERGE Prevent out of bounds ↵Jean-Michel Trivi2018-10-110-0/+0
| | | | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | accesses in lppTransposer() am: 2eaadebcb6 am: 589e1e861f am: e2491a2024 am: 9c00c42d95 skipped: c7e9a56431 am: 14fd59e8c4 am: 162f98a177 am: 14ea3dc906 -s ours Change-Id: Ia03fc2d353c2a39318fa752f3c6f152c43bf6138
| | | | | | | * | | | [automerger] DO NOT MERGE Prevent out of bounds accesses in lppTransposer() ↵Jean-Michel Trivi2018-10-110-0/+0
| | | | | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 2eaadebcb6 am: 589e1e861f am: e2491a2024 am: 9c00c42d95 skipped: c7e9a56431 am: 14fd59e8c4 am: 162f98a177 Change-Id: Ic656bdbc49436976b0edf6193bb02aa2af6b8764
| | | | | | | | * | | [automerger] DO NOT MERGE Prevent out of bounds accesses in lppTransposer() ↵Jean-Michel Trivi2018-10-110-0/+0
| | | | | | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 2eaadebcb6 am: 589e1e861f am: e2491a2024 am: 9c00c42d95 skipped: c7e9a56431 am: 14fd59e8c4 Change-Id: Ic0b562d5f0df43d9927f857600eba9ae5930b7c5
| | | | | | | | | * | [automerger] DO NOT MERGE Prevent out of bounds accesses in lppTransposer() ↵Android Build Merger (Role)2018-10-110-0/+0
| | | | | | | | | |\ \ | | | | | | | | | | |/ | | | | | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 2eaadebcb6 am: 589e1e861f am: e2491a2024 am: 9c00c42d95 skipped: c7e9a56431 Change-Id: I53774f0e504aeb7ee31e260753542ba586f97e5d
| | | | | | | | | | * [automerger] DO NOT MERGE Prevent out of bounds accesses in lppTransposer() ↵Android Build Merger (Role)2018-10-111-13/+24
| | | | | | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 2eaadebcb6 am: 589e1e861f am: e2491a2024 am: 9c00c42d95 Change-Id: Ic0382abb5ad456a976bfa97ba40401593fe0e265
| | | | | | | | | | | * [automerger] DO NOT MERGE Prevent out of bounds accesses in lppTransposer() ↵Android Build Merger (Role)2018-10-111-13/+24
| | | | | | | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 2eaadebcb6 am: 589e1e861f am: e2491a2024 Change-Id: I26af673d8c8f32947bd041711a67f1e90abd4c5b
| | | | | | | | | | | | * [automerger] DO NOT MERGE Prevent out of bounds accesses in lppTransposer() ↵Android Build Merger (Role)2018-10-111-13/+24
| | | | | | | | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 2eaadebcb6 am: 589e1e861f Change-Id: I319554e07343c649f0ba37e719fbc144336b5e3e
| | | | | | | | | | | | | * [automerger] DO NOT MERGE Prevent out of bounds accesses in lppTransposer() ↵Android Build Merger (Role)2018-10-111-13/+24
| | | | | | | | | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 2eaadebcb6 Change-Id: I81009a5c6f58c225692c39e95038dd3b77290130
| | | | | | | | | | | | | | * DO NOT MERGE Prevent out of bounds accesses in lppTransposer()Jean-Michel Trivi2018-10-111-13/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Check validity of pSettings->noOfPatches to prevent out of bounds access in lppTransposer(), which can also cause memSize to be negative. Bug: 112160868 Test: see poc in bug Change-Id: I77bd1e1dfab3bac92b4522170bdc3c9eb56fdf82
| | | | | * | | | | | | | | | Snap for 5058880 from 927448349c11391dae98fe1581813ae7ea1520ad to ↵android-build-team Robot2018-10-102-27/+50
| | | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pi-qpr2-release Change-Id: I29a06049a91662e96b50e7776d55bcc79123ad19
| | | | | | * | | | | | | | | Merge "Prevent out of bounds accesses in lppTransposer() and ↵Jean-Michel Trivi2018-10-082-27/+50
| | | | | | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lppTransposerHBE()" into pi-dev
| | | | | | | * | | | | | | | | Prevent out of bounds accesses in lppTransposer() and lppTransposerHBE()Fraunhofer IIS FDK2018-10-052-27/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 112160868 Test: see poc in bug Change-Id: I6a2161865d9cb9b51dc37c09d6e3a4a8e5d11f86
| | | | | * | | | | | | | | | | Snap for 5044688 from 28234107a71eb9ca3d214bbbe40e57c5055579df to ↵android-build-team Robot2018-10-022-22/+11
| | | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pi-qpr2-release Change-Id: I3a3fcee6eea771b068b69ab5a1c96ffa00ca397f
| | | | | | * | | | | | | | | | Merge "Unify audio element loop abort criterion in ER syntax" into pi-devJean-Michel Trivi2018-10-011-7/+4
| | | | | | |\ \ \ \ \ \ \ \ \ \
| | | | | | | * | | | | | | | | | Unify audio element loop abort criterion in ER syntaxFraunhofer IIS FDK2018-09-271-7/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 112891548 Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc Change-Id: Iea56cf804cfb9d396810124c718fc91bdff68392
| | | | | | * | | | | | | | | | | Always check whether given channel config is supported.Fraunhofer IIS FDK2018-09-281-11/+3
| | | | | | | |/ / / / / / / / / | | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 112660981 Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc Change-Id: I169161dd31bc624f2cab6be2b4c6518946ed32ba Merged-In: I169161dd31bc624f2cab6be2b4c6518946ed32ba
| | | | | | * | | | | | | | | | Merge "Prevent bit buffer counter overflow." into pi-devJean-Michel Trivi2018-09-0612-166/+91
| | | | | | |\ \ \ \ \ \ \ \ \ \
| | | | | | | * | | | | | | | | | Prevent bit buffer counter overflow.Fraunhofer IIS FDK2018-08-1712-166/+91
| | | | | | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While long-term test we discovered a bit counter overflow in the bit buffer. The bit buffer state was only used by HCR and RVLC tool and can easily be substituted with FDKgetValidBits() call. The following patch completely removes the bit counter and all its obsolete functions. Bug: 112662184 Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc Change-Id: Icee0519d26a2aa62367d2dece59cd3d60ffcade7
| | | | | | * | | | | | | | | | Merge "Break audio element loop in case element_count becomes too large." ↵Jean-Michel Trivi2018-09-061-1/+24
| | | | | | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into pi-dev
| | | | | | | * | | | | | | | | | Break audio element loop in case element_count becomes too large.Fraunhofer IIS FDK2018-09-051-1/+24
| | | | | | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 112891564 Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc Change-Id: I35f02d23c0cfd620088291a52d9996a0d5a17199
| | | | | | * | | | | | | | | | Merge "Prevent overflow in concealment clipping check" into pi-devTreeHugger Robot2018-09-061-4/+4
| | | | | | |\ \ \ \ \ \ \ \ \ \
| | | | | | | * | | | | | | | | | Prevent overflow in concealment clipping checkFraunhofer IIS FDK2018-09-051-4/+4
| | | | | | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 112890225 Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc Change-Id: Ie386e4b6fe5cdb38180f673edde8f84c36c7b522
| | | | | | * / / / / / / / / / Add sampling rate sanity checkFraunhofer IIS FDK2018-09-051-1/+3
| | | | | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 112661641 Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc Change-Id: I8e416fb1501dabda20babd4a28a99ab06950b221
| | | * | | | | | | | | | | | Merge "Add QMF analysis band sanity check"Jean-Michel Trivi2019-02-012-3/+11
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: b30e02cfd3 Change-Id: I6f21f18ac59f27eecdddb37d81bdfacf34cbae38
| | * | | | | | | | | | | | | Merge "Add QMF analysis band sanity check"Jean-Michel Trivi2019-02-012-3/+11
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | Add QMF analysis band sanity checkFraunhofer IIS FDK2019-01-152-3/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc Change-Id: I0001e0996a970e91a21bfe8ba051fdba0c06c219
| | | | * | | | | | | | | | | | Merge "Do not support channel configuration change within PCE"Jean-Michel Trivi2019-01-151-7/+1
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: ed56e77acb Change-Id: I46123b5bebaf9418a6033a1a88d5d2542f6ade6d
| | | | * | | | | | | | | | | | Merge "Add AOT specific number of qmf bands sanity check in ↵Fraunhofer IIS FDK2019-01-039-50/+144
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SpatialSpecificConfig()" am: bcda185d56 Change-Id: I0717e1ac3818b2516b3a57b929e2d84f4384dbce
| | | | * | | | | | | | | | | | Merge "Integer overflow fix in _compressorIO_sigmoid()"Fraunhofer IIS FDK2019-01-031-2/+3
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 7c908b13b9 Change-Id: I8265838085c3db1931a4ccb614ec7e4cdcca63e5
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ Merge "Return transport decoder error in case of invalid ELD configuration"Jean-Michel Trivi2019-01-021-0/+8
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 7884aefc84 Change-Id: Iff226ac091d4dffb5d94033c0afcfb0af4c5bfd2
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Add sanity check in huff_decode()"Jean-Michel Trivi2019-01-021-0/+8
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 3942213f19 Change-Id: I33db3f469583b7490860fb5f79189da6c5519085
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge changes I7add6dff,I0249f758Fraunhofer IIS FDK2019-01-021-6/+18
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: b42dfa745b Change-Id: I7c8544215b13db8440c4a72671996da0fac3be2e
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Clear spatial specific config struct at the beginning of parse routines"Fraunhofer IIS FDK2018-12-291-0/+4
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 0142f38904 Change-Id: I0e63ee92cbfb9cfec24b6e1adfb77e5929dad0e1
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Free whole QMF domain in case of an error in FDK_QmfDomain_Configure()"Fraunhofer IIS FDK2018-12-291-3/+2
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: f8881d4bfe Change-Id: Ic1665375b62c5fc64a302395b88a25bd024e17fc
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "QMF configuration flag QMF_FLAG_MPSLDFB has always priority over ↵Fraunhofer IIS FDK2018-12-292-4/+5
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QMF_FLAG_CLDFB" am: cf4098ed3b Change-Id: I0166285d3129440c9caa444fe4fcfa9d59c1f6c1
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Add missing parameter initialization in FDK_QmfDomain_Clear*() functions"Fraunhofer IIS FDK2018-12-291-0/+2
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 6953f2c5b2 Change-Id: I5ba0dab4dada24f3e5fbe642e927275a0fa6aa0b
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Prevent energy overflow in acelp calc_period_factor()"Fraunhofer IIS FDK2018-12-291-1/+1
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: eb9319afb2 Change-Id: Ic02c1abe8a36b5860242a8a475a68c3012c3873d