summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-11-05Merge "fsck_msdosfs: truncate directory entry when the head pointer is ↵HEADt_frc_odp_330442040t_frc_odp_330442000t_frc_con_330443020t_frc_cbr_330443000t_frc_ase_330444010t_frc_art_330443060t_frc_adb_330444000frc_340821000frc_340819280frc_340819220frc_340819190frc_340819030frc_340819020frc_340819010frc_340818170frc_340818110android-vts-14.0_r4android-vts-14.0_r3android-vts-14.0_r2android-vts-14.0_r1android-u-beta-1-gplandroid-security-14.0.0_r8android-security-14.0.0_r7android-security-14.0.0_r6android-security-14.0.0_r5android-security-14.0.0_r4android-security-14.0.0_r3android-security-14.0.0_r2android-security-14.0.0_r1android-platform-14.0.0_r7android-platform-14.0.0_r6android-platform-14.0.0_r5android-platform-14.0.0_r4android-platform-14.0.0_r3android-platform-14.0.0_r2android-platform-14.0.0_r1android-cts-14.0_r4android-cts-14.0_r3android-cts-14.0_r2android-cts-14.0_r1android-14.0.0_r9android-14.0.0_r8android-14.0.0_r7android-14.0.0_r6android-14.0.0_r5android-14.0.0_r4android-14.0.0_r37android-14.0.0_r36android-14.0.0_r35android-14.0.0_r34android-14.0.0_r33android-14.0.0_r32android-14.0.0_r31android-14.0.0_r30android-14.0.0_r3android-14.0.0_r29android-14.0.0_r28android-14.0.0_r27android-14.0.0_r26android-14.0.0_r25android-14.0.0_r24android-14.0.0_r23android-14.0.0_r22android-14.0.0_r21android-14.0.0_r20android-14.0.0_r2android-14.0.0_r19android-14.0.0_r18android-14.0.0_r17android-14.0.0_r16android-14.0.0_r15android-14.0.0_r14android-14.0.0_r13android-14.0.0_r12android-14.0.0_r11android-14.0.0_r10android-14.0.0_r1android-13.0.0_r83android-13.0.0_r82android-13.0.0_r81android-13.0.0_r80android-13.0.0_r79android-13.0.0_r78android-13.0.0_r77android-13.0.0_r76android-13.0.0_r75android-13.0.0_r74android-13.0.0_r73android-13.0.0_r72android-13.0.0_r71android-13.0.0_r70android-13.0.0_r69android-13.0.0_r68android-13.0.0_r67android-13.0.0_r66android-13.0.0_r65android-13.0.0_r64android-13.0.0_r63android-13.0.0_r62android-13.0.0_r61android-13.0.0_r60android-13.0.0_r59android-13.0.0_r58android-13.0.0_r57android-13.0.0_r56android-13.0.0_r55android-13.0.0_r54android-13.0.0_r53android-13.0.0_r52android-13.0.0_r51android-13.0.0_r50android-13.0.0_r49android-13.0.0_r48android-13.0.0_r47android-13.0.0_r46android-13.0.0_r45android-13.0.0_r44android-13.0.0_r43android-13.0.0_r42android-13.0.0_r41android-13.0.0_r40android-13.0.0_r39android-13.0.0_r38android-13.0.0_r37android-13.0.0_r36android-13.0.0_r35android-13.0.0_r34android-13.0.0_r33android-13.0.0_r32android-13.0.0_r30android-13.0.0_r29android-13.0.0_r28android-13.0.0_r27android-13.0.0_r24android-13.0.0_r23android-13.0.0_r22android-13.0.0_r21android-13.0.0_r20android-13.0.0_r19android-13.0.0_r18android-13.0.0_r17android-13.0.0_r16aml_uwb_341513070aml_uwb_341511050aml_uwb_341310300aml_uwb_341310030aml_uwb_341111010aml_uwb_341011000aml_uwb_331910010aml_uwb_331820070aml_uwb_331613010aml_uwb_331611010aml_uwb_331410010aml_uwb_331310030aml_uwb_331115000aml_uwb_331015040aml_uwb_330810010aml_tz5_341510070aml_tz5_341510050aml_tz5_341510010aml_tz4_332714070aml_tz4_332714050aml_tz4_332714010aml_tz4_331910000aml_tz4_331314030aml_tz4_331314020aml_tz4_331314010aml_tz4_331012050aml_tz4_331012040aml_tz4_331012000aml_rkp_341510000aml_rkp_341311000aml_rkp_341114000aml_rkp_341015010aml_rkp_341012000aml_odp_341610000aml_hef_341613000aml_hef_341512030aml_hef_341415040aml_hef_341311010aml_hef_341114030aml_go_wif_330911000aml_go_uwb_330912000aml_go_tz4_330912000aml_go_tet_330914010aml_go_swc_330913000aml_go_sta_330911000aml_go_sdk_330810000aml_go_sch_330911000aml_go_res_330912000aml_go_per_330912000aml_go_odp_330913000aml_go_odp_330912000aml_go_neu_330912000aml_go_net_330913000aml_go_mpr_330912000aml_go_ase_330913000aml_go_ads_330915100aml_go_ads_330915000aml_go_ads_330913000aml_go_adb_330913000aml_cfg_341510000aml_ase_341510000aml_ase_341410000aml_ase_341310010aml_ase_341113000aml_ase_340913000aml_ase_331311020aml_ase_331112000aml_ase_331011020aml_ads_341615050aml_ads_341517040aml_ads_341413000aml_ads_341316030aml_ads_341131050aml_ads_341027030aml_ads_340915050aml_ads_331920180aml_ads_331814200aml_ads_331710270aml_ads_331611190aml_ads_331511020aml_ads_331418080aml_ads_331131000mastermain-16k-with-phonesmain-16kmainandroid14-tests-releaseandroid14-security-releaseandroid14-s2-releaseandroid14-s1-releaseandroid14-releaseandroid14-qpr2-s5-releaseandroid14-qpr2-s4-releaseandroid14-qpr2-s3-releaseandroid14-qpr2-s2-releaseandroid14-qpr2-s1-releaseandroid14-qpr2-releaseandroid14-qpr1-s2-releaseandroid14-qpr1-releaseandroid14-platform-releaseandroid14-mainline-uwb-releaseandroid14-mainline-healthfitness-releaseandroid14-mainline-appsearch-releaseandroid14-mainline-adservices-releaseandroid14-gsiandroid14-devandroid14-d1-s7-releaseandroid14-d1-s6-releaseandroid14-d1-s5-releaseandroid14-d1-s4-releaseandroid14-d1-s3-releaseandroid14-d1-s2-releaseandroid14-d1-s1-releaseandroid14-d1-releaseandroid13-qpr3-s9-releaseandroid13-qpr3-s8-releaseandroid13-qpr3-s7-releaseandroid13-qpr3-s6-releaseandroid13-qpr3-s5-releaseandroid13-qpr3-s4-releaseandroid13-qpr3-s3-releaseandroid13-qpr3-s2-releaseandroid13-qpr3-s14-releaseandroid13-qpr3-s13-releaseandroid13-qpr3-s12-releaseandroid13-qpr3-s11-releaseandroid13-qpr3-s10-releaseandroid13-qpr3-s1-releaseandroid13-qpr3-releaseandroid13-qpr3-c-s8-releaseandroid13-qpr3-c-s7-releaseandroid13-qpr3-c-s6-releaseandroid13-qpr3-c-s5-releaseandroid13-qpr3-c-s4-releaseandroid13-qpr3-c-s3-releaseandroid13-qpr3-c-s2-releaseandroid13-qpr3-c-s12-releaseandroid13-qpr3-c-s11-releaseandroid13-qpr3-c-s10-releaseandroid13-qpr3-c-s1-releaseandroid13-qpr2-s9-releaseandroid13-qpr2-s8-releaseandroid13-qpr2-s7-releaseandroid13-qpr2-s6-releaseandroid13-qpr2-s5-releaseandroid13-qpr2-s3-releaseandroid13-qpr2-s2-releaseandroid13-qpr2-s12-releaseandroid13-qpr2-s11-releaseandroid13-qpr2-s10-releaseandroid13-qpr2-s1-releaseandroid13-qpr2-releaseandroid13-qpr2-b-s1-releaseandroid13-qpr1-s8-releaseandroid13-qpr1-s7-releaseandroid13-qpr1-s6-releaseandroid13-qpr1-s5-releaseandroid13-qpr1-s4-releaseandroid13-qpr1-s3-releaseandroid13-qpr1-s2-releaseandroid13-qpr1-s1-releaseandroid13-qpr1-releaseandroid13-mainline-uwb-releaseandroid13-mainline-tzdata4-releaseandroid13-mainline-go-wifi-releaseandroid13-mainline-go-uwb-releaseandroid13-mainline-go-tzdata4-releaseandroid13-mainline-go-tethering-releaseandroid13-mainline-go-sdkext-releaseandroid13-mainline-go-scheduling-releaseandroid13-mainline-go-resolv-releaseandroid13-mainline-go-permission-releaseandroid13-mainline-go-os-statsd-releaseandroid13-mainline-go-odp-releaseandroid13-mainline-go-neuralnetworks-releaseandroid13-mainline-go-networking-releaseandroid13-mainline-go-mediaprovider-releaseandroid13-mainline-go-media-swcodec-releaseandroid13-mainline-go-appsearch-releaseandroid13-mainline-go-adservices-releaseandroid13-mainline-go-adbd-releaseandroid13-mainline-appsearch-releaseandroid13-mainline-adservices-releaseandroid13-frc-odp-releaseandroid13-frc-conscrypt-releaseandroid13-frc-cellbroadcast-releaseandroid13-frc-art-releaseandroid13-frc-adbd-releaseandroid13-devandroid13-d4-s2-releaseandroid13-d4-s1-releaseandroid13-d4-releaseandroid13-d3-s1-releaseandroid13-d2-releaseaml_tz5_341510010aml_tz4_332714010Treehugger Robot
invalid." am: 023cbbf051 am: ab03d40eae am: d0bbf5abf8 am: e6c9fb0ad2 am: 91e4b8ff33 Original change: https://android-review.googlesource.com/c/platform/external/fsck_msdos/+/1881794 Change-Id: I6d5cb14b26a066f3f7cfd84f59e46638f5dfe8aa
2021-11-05Merge "fsck_msdosfs: truncate directory entry when the head pointer is ↵Treehugger Robot
invalid." am: 023cbbf051 am: ab03d40eae am: d0bbf5abf8 am: e6c9fb0ad2 Original change: https://android-review.googlesource.com/c/platform/external/fsck_msdos/+/1881794 Change-Id: I46a6a1e90f8b946f0a950a9f0e30d27e90eec052
2021-11-05Merge "fsck_msdosfs: truncate directory entry when the head pointer is ↵Treehugger Robot
invalid." am: 023cbbf051 am: ab03d40eae am: d0bbf5abf8 Original change: https://android-review.googlesource.com/c/platform/external/fsck_msdos/+/1881794 Change-Id: I19542d899e125125aa4a62cf30b3f88969d3a6d0
2021-11-05Merge "fsck_msdosfs: truncate directory entry when the head pointer is ↵Treehugger Robot
invalid." am: 023cbbf051 am: ab03d40eae Original change: https://android-review.googlesource.com/c/platform/external/fsck_msdos/+/1881794 Change-Id: If6bf1a92e2dc66d93a8c67245052ca9096bc274e
2021-11-05Merge "fsck_msdosfs: truncate directory entry when the head pointer is ↵android-t-preview-2android-t-preview-1android-t-beta-3android-s-v2-beta-3android-s-qpr3-beta-1android-t-preview-1android-s-v2-beta-3android-s-qpr3-beta-1Treehugger Robot
invalid." am: 023cbbf051 Original change: https://android-review.googlesource.com/c/platform/external/fsck_msdos/+/1881794 Change-Id: I558d48160e04d9a9dbc73ec091af2639b55e0816
2021-11-05Merge "fsck_msdosfs: truncate directory entry when the head pointer is invalid."Treehugger Robot
2021-11-04fsck_msdosfs: truncate directory entry when the head pointer is invalid.Xin Li
Sync with upstream (890cae197737b463e56d1cc5a3f61f84cb49c807). Bug: 205193362 Fixed: 205193362 Tests: run fsck_msdos on disk image Change-Id: Idf5a59c2b1951ca51e996b44fa62d72c3d82f81c
2021-11-04Import revision 890cae197737b463e56d1cc5a3f61f84cb49c807 from FreeBSD.upstream-masterXin Li
Change-Id: Ibf4413e89d25b9b3bb365c9ac4de7ce6bf99e53e
2021-06-02Merge sc-mainline-prodXin Li
Bug: 189946434 Change-Id: I104da3dbb263c53add402c03ce4e8403c2ca06c1
2021-05-17Merge "Add aosp patch to fix filesystem check fail when mounting." am: ↵Treehugger Robot
b1b772592b am: 2225448c26 am: b1d300f45a am: 6df6319da8 am: c5147bee1c am: 4608a127c2 Original change: https://android-review.googlesource.com/c/platform/external/fsck_msdos/+/1696727 Change-Id: I4130b5651c4b03c98a429283ca6d5fceeb35e266
2021-05-17Merge "Add aosp patch to fix filesystem check fail when mounting." am: ↵Treehugger Robot
b1b772592b am: 2225448c26 am: b1d300f45a am: 6df6319da8 am: 322f2c3952 am: d5fa83da35 Original change: https://android-review.googlesource.com/c/platform/external/fsck_msdos/+/1696727 Change-Id: I3c457e214be33077efe1c315ab0198b10976071e
2021-05-15Merge "Add aosp patch to fix filesystem check fail when mounting." am: ↵Treehugger Robot
b1b772592b am: 2225448c26 am: b1d300f45a am: 6df6319da8 am: c5147bee1c Original change: https://android-review.googlesource.com/c/platform/external/fsck_msdos/+/1696727 Change-Id: Ibfe19b14f3aa3f447f7455e80deeabc8bcb8f753
2021-05-05Merge "Add aosp patch to fix filesystem check fail when mounting." am: ↵Treehugger Robot
b1b772592b am: 2225448c26 am: b1d300f45a am: 6df6319da8 am: 322f2c3952 Original change: https://android-review.googlesource.com/c/platform/external/fsck_msdos/+/1696727 Change-Id: I5a0b4aafd408405f28ecc6b8a88b9ac7a0331914
2021-05-05Merge "Add aosp patch to fix filesystem check fail when mounting." am: ↵android-12.1.0_r26android-12.1.0_r25android-12.1.0_r24android-12.1.0_r23android-12.1.0_r18android-12.1.0_r17android-12.1.0_r16android-12.1.0_r15android-12.1.0_r14android-12.1.0_r13android-12.1.0_r12android12L-d2-s8-releaseandroid12L-d2-s7-releaseandroid12L-d2-s6-releaseandroid12L-d2-s5-releaseandroid12L-d2-s4-releaseandroid12L-d2-s3-releaseandroid12L-d2-s2-releaseandroid12L-d2-s1-releaseandroid12L-d2-releaseTreehugger Robot
b1b772592b am: 2225448c26 am: b1d300f45a am: 6df6319da8 Original change: https://android-review.googlesource.com/c/platform/external/fsck_msdos/+/1696727 Change-Id: I078d009abb3963f2d72b18ccc000c3789c429069
2021-05-05Merge "Add aosp patch to fix filesystem check fail when mounting." am: ↵android-mainline-12.0.0_r99android-mainline-12.0.0_r98android-mainline-12.0.0_r77android-mainline-12.0.0_r70android-mainline-12.0.0_r69android-mainline-12.0.0_r63android-mainline-12.0.0_r59android-mainline-12.0.0_r56android-mainline-12.0.0_r5android-mainline-12.0.0_r49android-mainline-12.0.0_r42android-mainline-12.0.0_r39android-mainline-12.0.0_r22android-mainline-12.0.0_r19android-mainline-12.0.0_r122android-mainline-12.0.0_r115android-mainline-12.0.0_r113android-mainline-12.0.0_r100aml_tz3_311312010android12-mainline-networkstack-releaseandroid12-mainline-art-releaseTreehugger Robot
b1b772592b am: 2225448c26 am: b1d300f45a am: 6df6319da8 Original change: https://android-review.googlesource.com/c/platform/external/fsck_msdos/+/1696727 Change-Id: Ia95d627fb13f3784ff5854c7eb13e90c08c87a2f
2021-05-05Merge "Add aosp patch to fix filesystem check fail when mounting." am: ↵Treehugger Robot
b1b772592b am: 2225448c26 am: b1d300f45a am: 6df6319da8 Original change: https://android-review.googlesource.com/c/platform/external/fsck_msdos/+/1696727 Change-Id: I0cc43d060860a9ed93bfd14e9378734cba003588
2021-05-05Merge "Add aosp patch to fix filesystem check fail when mounting." am: ↵android-s-v2-preview-2android-s-v2-preview-1android-s-v2-beta-2android-s-v2-preview-1Treehugger Robot
b1b772592b am: 2225448c26 am: b1d300f45a am: 6df6319da8 Original change: https://android-review.googlesource.com/c/platform/external/fsck_msdos/+/1696727 Change-Id: I941faf20e009b14da8e0188c5321469e3d625813
2021-05-05Merge "Add aosp patch to fix filesystem check fail when mounting." am: ↵android-12.1.0_r9android-12.1.0_r8android-12.1.0_r7android-12.1.0_r22android-12.1.0_r21android-12.1.0_r20android-12.1.0_r19android-12.1.0_r11android-12.1.0_r10android-12.0.0_r32android-12.0.0_r29android-12.0.0_r28android-12.0.0_r27android-12.0.0_r26android-12.0.0_r21android-12.0.0_r20android-12.0.0_r19android-12.0.0_r18android-12.0.0_r16android12L-devandroid12-qpr3-s7-releaseandroid12-qpr3-s6-releaseandroid12-qpr3-s5-releaseandroid12-qpr3-s4-releaseandroid12-qpr3-s3-releaseandroid12-qpr3-s2-releaseandroid12-qpr3-s1-releaseandroid12-qpr3-releaseandroid12-qpr1-releaseandroid12-qpr1-d-s3-releaseandroid12-qpr1-d-s2-releaseandroid12-qpr1-d-s1-releaseandroid12-qpr1-d-releaseandroid12-devTreehugger Robot
b1b772592b am: 2225448c26 am: b1d300f45a Original change: https://android-review.googlesource.com/c/platform/external/fsck_msdos/+/1696727 Change-Id: I6f48585b8aa45eb5b3c1a2cec38c366c2b72b88e
2021-05-05Merge "Add aosp patch to fix filesystem check fail when mounting." am: ↵Treehugger Robot
b1b772592b am: 2225448c26 Original change: https://android-review.googlesource.com/c/platform/external/fsck_msdos/+/1696727 Change-Id: I6e2f3efde9c8eaa7c0a324f3bf64cd4773df81cf
2021-05-05Merge "Add aosp patch to fix filesystem check fail when mounting." am: ↵android-s-beta-5android-s-beta-4android-s-beta-3android-s-beta-5android-s-beta-4Treehugger Robot
b1b772592b Original change: https://android-review.googlesource.com/c/platform/external/fsck_msdos/+/1696727 Change-Id: If7a8744689d58c16da2b5dd526ca4a3fcf15bf07
2021-05-05Merge "Add aosp patch to fix filesystem check fail when mounting."android-s-beta-2android-s-beta-1Treehugger Robot
2021-05-05Add aosp patch to fix filesystem check fail when mounting.silver.chen
Modify files: 1. external/fsck_msdos/check.c Root Cause: fsck_msdos will return 4 after repairing file system on An P. After An Q, this action become return 8, which lead to file system check failed. Solution: We manually change return value to 4 to resolve this issue. when return value is 4, vold will retry fsck multiple time, so we don't have to unplug and plug the device. Test: 1. build pass. Bug: 186611822 Change-Id: I9780b4b894463780b179cf0f6042883df0a12a71
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: cab9fc3f11 -s ↵Xin Li
ours am: fab66c6646 -s ours am: 7e08b53b78 -s ours am skip reason: Change-Id I6f44ea5bd17b226a3b39fafe620df5f23d8f9533 with SHA-1 10bbc419bc is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I3e1b5cb08cf7730da406447974bb9217627bc9e4
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: cab9fc3f11 -s ↵Xin Li
ours am: fab66c6646 -s ours am: 7e08b53b78 -s ours am skip reason: Change-Id I6f44ea5bd17b226a3b39fafe620df5f23d8f9533 with SHA-1 10bbc419bc is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ifac6e2c25925bf5bc7e58b5dec575862b29c8dd5
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: cab9fc3f11 -s ↵Xin Li
ours am: fab66c6646 -s ours am skip reason: Change-Id I6f44ea5bd17b226a3b39fafe620df5f23d8f9533 with SHA-1 10bbc419bc is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I373e5cc4df061ea8415439247f9b784b4a48284d
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: cab9fc3f11 -s oursXin Li
am skip reason: Change-Id I6f44ea5bd17b226a3b39fafe620df5f23d8f9533 with SHA-1 10bbc419bc is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I85c31f3b50730ce717f890f0e2d9b73dc1b82c40
2021-02-20Mark ab/7061308 as merged in stage.Xin Li
Bug: 180401296 Merged-In: I6f44ea5bd17b226a3b39fafe620df5f23d8f9533 Change-Id: Ia7ca4a5c9c59ede8603f55bcb16a5933609dddc2
2021-02-16Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/fsck_msdos" am: 6e5f8806de ↵Treehugger Robot
am: a17cba229e am: 037c5d53d2 am: 19e2f76f35 Original change: https://android-review.googlesource.com/c/platform/external/fsck_msdos/+/1588930 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I5d508ca2d0463e28be768396888353df825b1cdc
2021-02-16Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/fsck_msdos" am: 6e5f8806de ↵Treehugger Robot
am: a17cba229e am: 037c5d53d2 am: 19e2f76f35 Original change: https://android-review.googlesource.com/c/platform/external/fsck_msdos/+/1588930 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Iea8a46e8d31d1377fce5d63f7a30ffc65764992f
2021-02-16Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/fsck_msdos" am: 6e5f8806de ↵Treehugger Robot
am: a17cba229e am: 037c5d53d2 Original change: https://android-review.googlesource.com/c/platform/external/fsck_msdos/+/1588930 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I6af2485774f24e965b2e829bc9fce12133b42a96
2021-02-16Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/fsck_msdos" am: 6e5f8806de ↵Treehugger Robot
am: a17cba229e Original change: https://android-review.googlesource.com/c/platform/external/fsck_msdos/+/1588930 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I2791e06141fdedf730b0c82e7b00304000d28d27
2021-02-16Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/fsck_msdos" am: 6e5f8806deTreehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/fsck_msdos/+/1588930 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I3920200e31acdb1ac641fe0cbb9b489e1d4cfee6
2021-02-16Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/fsck_msdos"android-s-preview-1Treehugger Robot
2021-02-12[LSC] Add LOCAL_LICENSE_KINDS to external/fsck_msdosBob Badour
Added SPDX-license-identifier-BSD to: Android.bp Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: Ib930f7a56774c1ae2528cbe1e1acdd0ff14965c5
2020-11-24Mark ab/6881855 as merged am: 151bed9fc0 am: 10bbc419bcXin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/fsck_msdos/+/13111705 Change-Id: Ib71b602883ecd7e7b8c67eb09f32b3f1b195b702
2020-11-24Mark ab/6881855 as merged am: 151bed9fc0Xin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/fsck_msdos/+/13111705 Change-Id: I6f44ea5bd17b226a3b39fafe620df5f23d8f9533
2020-11-23Mark ab/6881855 as mergedXin Li
Bug: 172690556 Change-Id: Iee171f5cc41e989e8aa5ced5f1c26e3c2821fb61
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 2b48521b99 -s ours am: ↵Xin Li
f465ed1d7b -s ours am: 739a50c34c -s ours am skip reason: Change-Id Id00ea78fa38c23a3eacc581af38f02be7f39630b with SHA-1 430ef1c7b7 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/fsck_msdos/+/12797239 Change-Id: I3a8a1bacaf9780a5bbb0331ce064b9f7cf1466a3
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 2b48521b99 -s ours am: ↵Xin Li
f465ed1d7b -s ours am skip reason: Change-Id Id00ea78fa38c23a3eacc581af38f02be7f39630b with SHA-1 430ef1c7b7 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/fsck_msdos/+/12797239 Change-Id: I481df6be1b01d3afcb81baed00b83be7c6b5b631
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 2b48521b99 -s oursXin Li
am skip reason: Change-Id Id00ea78fa38c23a3eacc581af38f02be7f39630b with SHA-1 430ef1c7b7 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/fsck_msdos/+/12797239 Change-Id: I3f5d0687dbac7c4907af86de2b938a31dea0214d
2020-10-08Skip ab/6749736 in stage.Xin Li
Merged-In: Id00ea78fa38c23a3eacc581af38f02be7f39630b Change-Id: I1783eac938f55ec5f5e560cd2cb928487b121d48
2020-09-23Merge "Sync with upstream 667eef4ac (svn revision 366064 + 366065)." am: ↵Treehugger Robot
b86e97b62c am: a1c9005dc8 am: c6bf77e339 am: c4caef411a am: 7d208f286e Original change: https://android-review.googlesource.com/c/platform/external/fsck_msdos/+/1434752 Change-Id: I1c9371be35ff9dfa6782496cd8e211f862c43955
2020-09-23Merge "Sync with upstream 667eef4ac (svn revision 366064 + 366065)." am: ↵Treehugger Robot
b86e97b62c am: a1c9005dc8 am: c6bf77e339 am: c4caef411a Original change: https://android-review.googlesource.com/c/platform/external/fsck_msdos/+/1434752 Change-Id: I78bab79efc1361f9164c5e3757db15f9723a9dee
2020-09-23Merge "Sync with upstream 667eef4ac (svn revision 366064 + 366065)." am: ↵Treehugger Robot
b86e97b62c am: a1c9005dc8 am: c6bf77e339 Original change: https://android-review.googlesource.com/c/platform/external/fsck_msdos/+/1434752 Change-Id: Ic1ebc9d76b70497c058f94b75baad8c2b269e455
2020-09-23Merge "Sync with upstream 667eef4ac (svn revision 366064 + 366065)." am: ↵Treehugger Robot
b86e97b62c am: a1c9005dc8 Original change: https://android-review.googlesource.com/c/platform/external/fsck_msdos/+/1434752 Change-Id: Ib6032533fcbc77dd2b14134bcae4499e6148f2df
2020-09-23Merge "Sync with upstream 667eef4ac (svn revision 366064 + 366065)." am: ↵Treehugger Robot
b86e97b62c Original change: https://android-review.googlesource.com/c/platform/external/fsck_msdos/+/1434752 Change-Id: I85e35d0d2e1f369ca4587a0cecce19cbd506b539
2020-09-23Merge "Sync with upstream 667eef4ac (svn revision 366064 + 366065)."Treehugger Robot
2020-09-23Sync with upstream 667eef4ac (svn revision 366064 + 366065).Xin Li
Fix an integer overflow on 32-bit platforms. The purpose of checksize() is to verify that the referenced cluster chain size matches the recorded file size (up to 2^32 - 1) in the directory entry. We follow the cluster chain, then multiple the cluster count by bytes per cluster to get the physical size, then check it against the recorded size. When a file is close to 4 GiB (between 4GiB - cluster size and 4GiB, both non-inclusive), the product of cluster count and bytes per cluster would be exactly 4 GiB. On 32-bit systems, because size_t is 32-bit, this would wrap back to 0, which will cause the file be truncated to 0. Fix this by using 64-bit physicalSize instead. Bug: 167345711 Change-Id: Ica05e89fdbf3c9078a0939be340a045e00460eb0
2020-09-23Import revision 667eef4ac6396ffe2d705b401a2a09f60ab38fe7 from FreeBSD.Xin Li
Change-Id: I23f5307232024b7ddabb6441cb1b6cd4e8aab641
2020-09-23Import revision 4b0089abdf36a27fda364b25e95706a0abfe6c3a from FreeBSD.Xin Li
Change-Id: Ib131afe8f995a1847f2f8090c62b288177f6c23b
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-13 21:33:39 +0000