summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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 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 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
2020-04-28Sync with upstream 2ccadef (svn revision 360428): am: 4f36a18db8 am: ↵Xin Li
b0ad11e60a am: 0fa08a6c46 am: c2885567d2 am: ba8cb29526 Change-Id: I3e1d8b6097db958190d5b03487a0a76d2c2328fe
2020-04-28Sync with upstream 2ccadef (svn revision 360428): am: 4f36a18db8 am: ↵Xin Li
063c1723a6 am: 430ef1c7b7 am: 9bc21148f2 Change-Id: I388f7122b103d4a2c76d65d2298be50a4c38db18
2020-04-28Sync with upstream 2ccadef (svn revision 360428): am: 4f36a18db8 am: ↵Xin Li
b0ad11e60a am: 3615221bfd am: 6fb73cd615 Change-Id: Ia59a41499eb47ca20ac8746ec546f0e3cea379d3
2020-04-28Sync with upstream 2ccadef (svn revision 360428): am: 4f36a18db8 am: ↵Xin Li
b0ad11e60a am: 0fa08a6c46 am: c2885567d2 Change-Id: I7350e223cc9581cd155bed6d5fcd7a3dc5fb8aee
2020-04-28Sync with upstream 2ccadef (svn revision 360428): am: 4f36a18db8 am: ↵Xin Li
063c1723a6 am: 430ef1c7b7 Change-Id: I67df1425c7039a8b57e0c8a02b77b2361ff766a6
2020-04-28Sync with upstream 2ccadef (svn revision 360428): am: 4f36a18db8 am: ↵Xin Li
b0ad11e60a am: 0fa08a6c46 Change-Id: I8144d81ac24ad4318d6dc758492faa32ea79be89
2020-04-28Sync with upstream 2ccadef (svn revision 360428): am: 4f36a18db8 am: ↵Xin Li
b0ad11e60a am: 3615221bfd Change-Id: Icd36a6b0f2117383a8960e25afd8b4f0a7c55357
2020-04-28Sync with upstream 2ccadef (svn revision 360428): am: 4f36a18db8 am: 063c1723a6Xin Li
Change-Id: Id00ea78fa38c23a3eacc581af38f02be7f39630b
2020-04-28Sync with upstream 2ccadef (svn revision 360428): am: 4f36a18db8 am: b0ad11e60aXin Li
Change-Id: I2a3832af2ee31734b588dbb01e07f3c054d254df
2020-04-28Sync with upstream 2ccadef (svn revision 360428): am: 4f36a18db8 am: b0ad11e60aandroid-11.0.0_r48android-11.0.0_r47android-11.0.0_r46android-11.0.0_r45android-11.0.0_r44android-11.0.0_r43android-11.0.0_r42android-11.0.0_r41android-11.0.0_r40android-11.0.0_r39android-11.0.0_r38android-11.0.0_r37android-11.0.0_r36android-11.0.0_r35android-11.0.0_r34android-11.0.0_r33android-11.0.0_r32android-11.0.0_r31android-11.0.0_r30android-11.0.0_r29android-11.0.0_r28android-11.0.0_r27android-11.0.0_r26android-11.0.0_r24android-11.0.0_r23android-11.0.0_r22android-11.0.0_r21android-11.0.0_r20android-11.0.0_r19android-11.0.0_r18android11-qpr3-s1-releaseandroid11-qpr3-releaseandroid11-qpr2-releaseandroid11-qpr1-s2-releaseandroid11-qpr1-s1-releaseandroid11-qpr1-releaseandroid11-qpr1-d-s1-releaseandroid11-qpr1-d-releaseandroid11-qpr1-c-releaseandroid11-d2-releaseXin Li
Change-Id: I52bbe5e34f427aa1ff3c8d827e9731f8ddd55e01
2020-04-28Sync with upstream 2ccadef (svn revision 360428): am: 4f36a18db8android-11.0.0_r16android11-d1-b-releaseXin Li
Change-Id: I30630b11f1f0c4af46a31282f90f8f79585b8b4a
2020-04-28Sync with upstream 2ccadef (svn revision 360428): am: 4f36a18db8Xin Li
Change-Id: I5e78f6975c2617a31e0878c7a12253e9f65c5aba
2020-04-28Merge "Sync with upstream 2ccadef (svn revision 360428):" am: 8bc9cb1ca2 am: ↵Treehugger Robot
2f294595d9 am: 9601c6e26e am: 25f59e1524 am: 2d53cf8bad Change-Id: Ie28578da64a13f9f8356f592f201c0189288b903
2020-04-28Merge "Sync with upstream 2ccadef (svn revision 360428):" am: 8bc9cb1ca2 am: ↵Treehugger Robot
2f294595d9 am: 9601c6e26e am: 25f59e1524 Change-Id: If7bb22a7ffd022dcb7f91fb16e309fdde4b83281
2020-04-28Sync with upstream ffa3961 (svn revision 360359): am: 05ca3f4d04 am: ↵Xin Li
376a7abc57 am: 62a8e9a842 am: 6d8a0e1b62 am: 94d23bd575 Change-Id: I31dcc7544f816256e295ee0fc34b66d7e112ada0
2020-04-28Sync with upstream ffa3961 (svn revision 360359): am: 05ca3f4d04 am: ↵Xin Li
376a7abc57 am: 641ad04bd1 am: 3d08146007 Change-Id: I2477d8c33fd816be12a000fb7cf095846ea518a9
2020-04-28Sync with upstream ffa3961 (svn revision 360359): am: 05ca3f4d04 am: ↵Xin Li
ce649bb773 am: 93caedf4af am: 2ecbfcdc42 Change-Id: I2bdde88f3fd74946f690839252aff668e3354330
2020-04-28Merge "Sync with upstream 2ccadef (svn revision 360428):" am: 8bc9cb1ca2 am: ↵Treehugger Robot
2f294595d9 am: 9601c6e26e Change-Id: I520d787407afc664f3c3767ec0e0942e5d40dd20
2020-04-28Sync with upstream ffa3961 (svn revision 360359): am: 05ca3f4d04 am: ↵Xin Li
376a7abc57 am: 62a8e9a842 am: 6d8a0e1b62 Change-Id: Ibabd8401de484b5b5cf86560edc13f44add84f59
2020-04-28Sync with upstream ffa3961 (svn revision 360359): am: 05ca3f4d04 am: ↵Xin Li
376a7abc57 am: 641ad04bd1 Change-Id: I4cde52d7b42c4d9d357638f3d790ef8028ac4b95
2020-04-28Sync with upstream ffa3961 (svn revision 360359): am: 05ca3f4d04 am: ↵Xin Li
ce649bb773 am: 93caedf4af Change-Id: I86f03fb6ff2f1d3b03513b30b89332e96803c025
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-28 04:52:32 +0000