aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Evaluate and return StoreConfigAsBitstream() error state.Fraunhofer IIS FDK2020-12-281-6/+10
| | | | | | Bug: 176246647 Test: atest DecoderTestXheAac DecoderTestAacDrc Change-Id: I025e943e91f9be1a5259a761a8ff88defd8babea
* Introduce aacDecoder_drcDisable() and always disable legacy DRC for USAC.Fraunhofer IIS FDK2020-12-283-8/+24
| | | | | | Bug: 176246647 Test: atest DecoderTestXheAac DecoderTestAacDrc Change-Id: I75edf24b18e1f5392b6eb179d5574cb93fcbc7c2
* Make sure that alphaValue is correctly initialized in sbrDecoder_drcApplySlot().Fraunhofer IIS FDK2020-12-281-19/+34
| | | | | | Bug: 176246647 Test: atest DecoderTestXheAac DecoderTestAacDrc Change-Id: I5bded2e3d29278bb5df561eaa2a46d963ee21df8
* Fix unsigned integer overflow in Hcr_State_BODY_SIGN_ESC__ESC_WORD().Fraunhofer IIS FDK2020-12-281-1/+3
| | | | | | Bug: 176246647 Test: atest DecoderTestXheAac DecoderTestAacDrc Change-Id: I5eb0f88a55e856c427f9e4647332070f66e673c5
* Validate DRC compression factor and DRC boost factor value range in ↵Fraunhofer IIS FDK2020-12-231-0/+6
| | | | | | | | aacDecoder_SetParam(). Bug: 176246647 Test: atest DecoderTestXheAac DecoderTestAacDrc Change-Id: I1d8534145bcf400c5da58d64d3b7e73a87cb43be
* Prevent integer overflow in subbandTPApply() energy update.Fraunhofer IIS FDK2020-12-231-4/+4
| | | | | | Bug: 176246647 Test: atest DecoderTestXheAac DecoderTestAacDrc Change-Id: I9ed8b33414907706808956cffad252052928c799
* Limit smoothedNoise values to avoid integer overflows in adjustTimeSlotHQ() ↵Fraunhofer IIS FDK2020-12-231-1/+18
| | | | | | | | and adjustTimeSlotHQ_GainAndNoise(). Bug: 176246647 Test: atest DecoderTestXheAac DecoderTestAacDrc Change-Id: Ib630d56a626ddd59a9155df38cda2011c3165346
* Avoid integer overflow in dct_II().Fraunhofer IIS FDK2020-12-231-15/+13
| | | | | | Bug: 176246647 Test: atest DecoderTestXheAac DecoderTestAacDrc Change-Id: I6c30c4dec3f85410c2748eb42d38f5eb72521ec5
* Prevent integer overflows in dualChannelFiltering() and eightChannelFiltering().Fraunhofer IIS FDK2020-12-231-13/+13
| | | | | | Bug: 176246647 Test: atest DecoderTestXheAac DecoderTestAacDrc Change-Id: Ic9217bbb3980807036ae6ae121e6ddb7cc1bce35
* Mark ab/6881855 as merged am: b831187d3a am: a5f0e4af6dXin Li2020-11-240-0/+0
|\ | | | | | | | | | | Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/13112547 Change-Id: I9243e7da297d69b2bcb1f2d87a4b7a36c961e063
| * Mark ab/6881855 as merged am: b831187d3aXin Li2020-11-240-0/+0
| |\ | | | | | | | | | | | | | | | Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/13112547 Change-Id: Id04d2590c249cad13da8dd8975d0a12ce96a9597
| | * Mark ab/6881855 as mergedXin Li2020-11-230-0/+0
| | |\ | | | | | | | | | | | | | | | | Bug: 172690556 Change-Id: I4edc064b9a87da525672e61919ec8fb59a70202e
* | | | [automerger skipped] Merge "Merge rvc-release RP1A.201105.002 to aosp-master ↵Bill Yi2020-11-050-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - DO NOT MERGE" am: f4adff7fbb am: 0834f1a0b8 -s ours am: dd90d1595f -s ours am: de35b0d3cc -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/external/aac/+/1486978 Change-Id: I01e518ed4a6d04fd21c673bd6fbf7c6739d21320
| * | | [automerger skipped] Merge "Merge rvc-release RP1A.201105.002 to aosp-master ↵Bill Yi2020-11-050-0/+0
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - DO NOT MERGE" am: f4adff7fbb am: 0834f1a0b8 -s ours am: dd90d1595f -s ours am skip reason: Change-Id I44e842648acbceb02bbc28cf2ad729a0caddf60d with SHA-1 1f2e0ecb62 is in history Original change: https://android-review.googlesource.com/c/platform/external/aac/+/1486978 Change-Id: I9d8f11842a7d222ff9eaf50be2e44f1507c4bb49
| | * | | [automerger skipped] Merge "Merge rvc-release RP1A.201105.002 to aosp-master ↵Bill Yi2020-11-050-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - DO NOT MERGE" am: f4adff7fbb am: 0834f1a0b8 -s ours am skip reason: Change-Id I44e842648acbceb02bbc28cf2ad729a0caddf60d with SHA-1 1f2e0ecb62 is in history Original change: https://android-review.googlesource.com/c/platform/external/aac/+/1486978 Change-Id: Ic6a0942fdd1af69a14653a456accfd76e9361bf1
| | | * | Merge "Merge rvc-release RP1A.201105.002 to aosp-master - DO NOT MERGE" am: ↵Bill Yi2020-11-050-0/+0
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f4adff7fbb Original change: https://android-review.googlesource.com/c/platform/external/aac/+/1486978 Change-Id: Ied811f647e67defe1286b9a8e4a0bdc2c89da3c2
| | | | * \ Merge "Merge rvc-release RP1A.201105.002 to aosp-master - DO NOT MERGE"Bill Yi2020-11-051-6/+6
| | | | |\ \
* | | | | | | [automerger skipped] Merge rvc-release RP1A.201105.002 to aosp-master - DO ↵Bill Yi2020-11-050-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NOT MERGE am: 5b4265a02a am: 8b4e287ff6 -s ours am: 51ff3aa199 -s ours am: 700bc783fb -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/external/aac/+/1486978 Change-Id: I77b49175f9c8523aa87b1aa4b99a106bdaef25b6
| * | | | | | [automerger skipped] Merge rvc-release RP1A.201105.002 to aosp-master - DO ↵Bill Yi2020-11-050-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NOT MERGE am: 5b4265a02a am: 8b4e287ff6 -s ours am: 51ff3aa199 -s ours am skip reason: Change-Id I44e842648acbceb02bbc28cf2ad729a0caddf60d with SHA-1 1f2e0ecb62 is in history Original change: https://android-review.googlesource.com/c/platform/external/aac/+/1486978 Change-Id: Ifc66ac802e4e6eec723e5e762cf94f107f5f7ba6
| | * | | | | [automerger skipped] Merge rvc-release RP1A.201105.002 to aosp-master - DO ↵Bill Yi2020-11-050-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NOT MERGE am: 5b4265a02a am: 8b4e287ff6 -s ours am skip reason: Change-Id I44e842648acbceb02bbc28cf2ad729a0caddf60d with SHA-1 1f2e0ecb62 is in history Original change: https://android-review.googlesource.com/c/platform/external/aac/+/1486978 Change-Id: Ia3fae7d8939333684ff3ea15081ac69624d58873
| | | * | | | Merge rvc-release RP1A.201105.002 to aosp-master - DO NOT MERGE am: 5b4265a02aBill Yi2020-11-050-0/+0
| | | |\ \ \ \ | | | | | |/ / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/external/aac/+/1486978 Change-Id: Ifc71d75171dfbc250f59774aea3ddb950e70d356
| | | | * | | Merge rvc-release RP1A.201105.002 to aosp-master - DO NOT MERGEBill Yi2020-11-041-6/+6
| | | | |\ \ \ | | | | | |/ / | | | | |/| | | | | | | | | | | | | | | | Merged-In: I44e842648acbceb02bbc28cf2ad729a0caddf60d Change-Id: Iead5cf2ca1c993da0844a11d1e64bf3cc86ed5dd
* | | | | | | [automerger skipped] Merge rvc-release RP1A.201105.002 to stage-aosp-master ↵Bill Yi2020-11-040-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - DO NOT MERGE am: 4c3407e563 -s ours am: 1f2e0ecb62 -s ours am: 092c1fb7fb -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/12984835 Change-Id: I8fc1c1761320ee974541e04597bba6d4f795575b
| * | | | | | [automerger skipped] Merge rvc-release RP1A.201105.002 to stage-aosp-master ↵Bill Yi2020-11-040-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - DO NOT MERGE am: 4c3407e563 -s ours am: 1f2e0ecb62 -s ours am skip reason: Change-Id I31fe9fe1e8dd7e919848be94dd73dfb779e7065d with SHA-1 aacea3ffc5 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/12984835 Change-Id: Ib5460d11c6484d4794e75fcd4c9ba48a4b57a472
| | * | | | | [automerger skipped] Merge rvc-release RP1A.201105.002 to stage-aosp-master ↵Bill Yi2020-11-040-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - DO NOT MERGE am: 4c3407e563 -s ours am skip reason: Change-Id I31fe9fe1e8dd7e919848be94dd73dfb779e7065d with SHA-1 aacea3ffc5 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/12984835 Change-Id: I44e842648acbceb02bbc28cf2ad729a0caddf60d
| | | * | | | Merge rvc-release RP1A.201105.002 to stage-aosp-master - DO NOT MERGEBill Yi2020-11-031-6/+6
| | | |\ \ \ \ | | | | |/ / / | | | |/| / / | | | | |/ / | | | | | | Merged-In: I31fe9fe1e8dd7e919848be94dd73dfb779e7065d Change-Id: I462d697908f9803317f038c916d5942967efa28a
| | | | * | Merge cherrypicks of [12620612, 12620613, 12620936, 12620457, 12616684, ↵android-build-team Robot2020-09-161-6/+6
| | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 12621005, 12620883, 12620884, 12620846, 12620847, 12620869, 12620848, 12620849, 12620961, 12620962, 12620827, 12620614, 12620197, 12620885, 12620198, 12621039, 12621040, 12621041, 12620937, 12620615, 12620886] into rvc-release Change-Id: If3dab82f5ef50b669aa488a49aebe27bb6070079
| | | | | * | Fix heap buffer overflow in sbrDecoder_AssignQmfChannels2SbrChannels().Fraunhofer IIS FDK2020-09-161-6/+6
| | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the bug the SBR decoder has already set up 9 channels and tries to allocate one more channel. The assignment of the QMF channels to SBR channels fails since the QMF domain manages only 8+1 channels instead of 10 channels as reqeusted by SBR. Here we have added a check in sbrDecoder_InitElement() which will return with a parse error in case additional SBR channels would exceed the maximum number of SBR channels. This solves the potential heap buffer overflow. Bug: 158762825 Test: atest DecoderTestAacDrc DecoderTestAacFormat DecoderTestXheAac Change-Id: I0150ac6d5a47ffce883010f531928656eebc619e Merged-In: I0150ac6d5a47ffce883010f531928656eebc619e (cherry picked from commit bb8f983bf36ee2ad8af6acebf4823a58060004ab)
| | | | * | Snap for 6544675 from ebc1030f65bb1e1e7dccf99e56a5d0221f097fdb to rvc-releaseandroid-build-team Robot2020-05-301-0/+2
| | | | |\ \ | | | | | | | | | | | | | | | | | | | | | Change-Id: Icd0e65b905da537b43498b94b7e4d0424837c9d1
| | | | * \ \ Snap for 6484097 from 71c477bae4e0b1bfad90fd4e4dbba496aa6d9c68 to rvc-releaseandroid-build-team Robot2020-05-121-0/+7
| | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I4db69c7d577a0fde24cf10c01302118be83a29cd
| | | | * \ \ \ Snap for 6211803 from 261fadc3a2221829196158824a512f11268756ef to rvc-releaseandroid-build-team Robot2020-02-164-24/+3
| | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I1d56321205dbd74479a72ecbbde137a18eef044b
| | | | * \ \ \ \ Snap for 6210127 from e016635f0d3a5c7532b00711ce461f97a13f7bc2 to rvc-releaseandroid-build-team Robot2020-02-1559-904/+1111
| | | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Icca87a4feea92b453adc049922c543eb3bf048fd
| | | | * \ \ \ \ \ Snap for 6206568 from 925092e8fcd9f3635fdff6ff34f8a4a290916885 to rvc-releaseandroid-build-team Robot2020-02-144-104/+53
| | | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ide088e86f1ced06e7717f8d78d187058bc7db370
| | | | * \ \ \ \ \ \ Snap for 6203617 from 31f66f6d3ffcfa429c170b2c35250982d11f5082 to rvc-releaseandroid-build-team Robot2020-02-138-19/+71
| | | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iefbacc1498ce7caf6c6ccb2df4c8b4c6cca4ab76
| | | | * \ \ \ \ \ \ \ Snap for 6164373 from 3255d513ce56f98085d77dd7b92840b73ab4cfd3 to rvc-releaseandroid-build-team Robot2020-01-282-5/+5
| | | | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I396303dd4ab4b8a24e0c6cf05b7ea0d48e3bdbc8
| | | | * \ \ \ \ \ \ \ \ Snap for 6157842 from f04a8a855cf8ddb5996c8e191fd3fa15b3808657 to rvc-releaseandroid-build-team Robot2020-01-248-33/+169
| | | | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Icd800c3d313c30fc67595fc70baaf69b12188cd7
| | | | * \ \ \ \ \ \ \ \ \ Snap for 6154573 from cedcc475f52dd704497524dda6ec2ef430d2b6c5 to rvc-releaseandroid-build-team Robot2020-01-233-3/+12
| | | | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I6edb0ebedba940eb136ae37bed4e010ee76f3d58
| | | | * \ \ \ \ \ \ \ \ \ \ Snap for 6145313 from cee316ab3ebde92047b5e76d15c00768b92cb890 to rvc-releaseandroid-build-team Robot2020-01-183-28/+19
| | | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I642e8bbffa03f9c9e718eb115125c1e0fa852556
| | | | * \ \ \ \ \ \ \ \ \ \ \ Snap for 6142138 from 1020e48d6e76506ac85a7678fe950ce7245d3aea to rvc-releaseandroid-build-team Robot2020-01-177-157/+138
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Icb323d1007194553c9b7494024ae7fab252696ee
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ Snap for 6138855 from 063d5f30864c6293855da6f7b8dd482d7c408158 to rvc-releaseandroid-build-team Robot2020-01-165-94/+121
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I76b653e2aa437267603833e7fade774c4d210243
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ Snap for 6110375 from 0c42941882ea8d9b11fc645ec46f5013009064ed to rvc-releaseandroid-build-team Robot2020-01-041-22/+0
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I35fa8d590ccadcd7865be09f72b893056aa85db9
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Snap for 6104206 from 47b23c88cfe81bbcc9ff0c8de1608283de18a475 to rvc-releaseandroid-build-team Robot2019-12-3117-209/+313
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I37ae8a78b271948e025a2e6c071453480dcc9a52
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Snap for 5978242 from 77e652f76694102b9c6499d5a2209ca0bf44e0c3 to rvc-releaseandroid-build-team Robot2019-10-310-0/+0
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I15dbe4ac65b3db43a510451b201c5da9455913d7
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Snap for 5956624 from fc8faa38d90380adfb61b2b280a36c73369c9aff to rvc-releaseandroid-build-team Robot2019-10-227-48/+58
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I90c7f7de4ed5bb04e355e181028c850f6e95d8ad
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Snap for 5945950 from 2152ae1a5ef0511e0b38a981745eb910f2af9bca to rvc-releaseandroid-build-team Robot2019-10-175-52/+48
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I4945162a10785a18df685897114d3715d75e807d
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Snap for 5942013 from da5b0dcb3c01197b3499e0b569babcb0f5a09bbe to rvc-releaseandroid-build-team Robot2019-10-164-35/+44
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I84e4e06054e0d2c04fe64b23f963e056b8e72947
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Snap for 5939454 from b1b306443a1cc0308fa563b40a281bae53346d01 to rvc-releaseandroid-build-team Robot2019-10-155-397/+66
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I6dae09bcdf2319101d416e69dbd3b8a5cc97ac95
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Snap for 5936682 from f26eb8af7c38047ad113072a6de38e069dc5cf3f to rvc-releaseandroid-build-team Robot2019-10-123-10/+32
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I5a7309c9ef4f186d05c08f072707ce3e2bf6a9b8
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Snap for 5864382 from 17bc55672e5cd439c590ee1096ff5fa904aea360 to rvc-releaseandroid-build-team Robot2019-09-100-0/+0
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I1813c2a55faf4d56dac4671182c7f040fad50a4c
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Snap for 5860386 from 710de1d4dbb96dc6e513fd5a20c5433946e670e3 to rvc-releaseandroid-build-team Robot2019-09-070-0/+0
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iafff7feea21247c065ee00282e6215c2aa14be1e