summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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
2020-04-28Sync with upstream ffa3961 (svn revision 360359): am: 05ca3f4d04 am: ↵Xin Li
376a7abc57 am: 62a8e9a842 Change-Id: Idf0158b8d1e38cd7cb70749c739dd8471d1adb29
2020-04-28Merge "Sync with upstream 2ccadef (svn revision 360428):" am: 8bc9cb1ca2 am: ↵Treehugger Robot
2f294595d9 Change-Id: I4dca6a3e3f00ca533d2d7027b9665f79a8e58ae1
2020-04-28Sync with upstream 2ccadef (svn revision 360428):android-mainline-11.0.0_r44android-mainline-11.0.0_r43android-mainline-11.0.0_r42android-mainline-11.0.0_r41android-mainline-11.0.0_r40android-mainline-11.0.0_r39android-mainline-11.0.0_r38android-mainline-11.0.0_r37android-mainline-11.0.0_r36android-mainline-11.0.0_r35android-mainline-11.0.0_r34android-mainline-11.0.0_r32android-mainline-11.0.0_r31android-mainline-11.0.0_r30android-mainline-11.0.0_r28android-mainline-11.0.0_r27android-mainline-11.0.0_r26android-mainline-11.0.0_r25android-mainline-11.0.0_r24android-mainline-11.0.0_r23android-mainline-11.0.0_r22android-mainline-11.0.0_r21android-mainline-11.0.0_r20android-mainline-11.0.0_r18android-mainline-11.0.0_r17android-mainline-11.0.0_r16android-mainline-11.0.0_r15android-mainline-11.0.0_r14android-mainline-11.0.0_r13android-mainline-11.0.0_r12android11-mainline-tethering-releaseandroid11-mainline-permission-releaseandroid11-mainline-os-statsd-releaseandroid11-mainline-networkstack-releaseandroid11-mainline-media-swcodec-releaseandroid11-mainline-media-releaseandroid11-mainline-extservices-releaseandroid11-mainline-documentsui-releaseandroid11-mainline-conscrypt-releaseandroid11-mainline-cellbroadcast-releaseandroid11-mainline-captiveportallogin-releaseandroid11-devXin Li
Do not overflow when calculating file system size. Test: build Bug: 155183047 Change-Id: I05a8f1b3ef10ec6a765a78adf122f274dcda12cd
2020-04-28Sync with upstream ffa3961 (svn revision 360359): am: 05ca3f4d04 am: 376a7abc57Xin Li
Change-Id: I97da4c79f3ac399a0d65a9147380e550f9294bc5
2020-04-28Sync with upstream ffa3961 (svn revision 360359): am: 05ca3f4d04 am: ce649bb773Xin Li
Change-Id: I63d0dbdeebb556451e38240d55559fdc48213fa5
2020-04-28Sync with upstream ffa3961 (svn revision 360359): am: 05ca3f4d04 am: 376a7abc57Xin Li
Change-Id: I8b46ccc81121f09df4ce67f072e542c5270a3793
2020-04-28Merge "Sync with upstream 2ccadef (svn revision 360428):" am: 8bc9cb1ca2android-r-beta-3android-r-beta-2Treehugger Robot
Change-Id: I87348a0d218cfd407f29b13a16262b4eded0c7f4
2020-04-28Merge "Sync with upstream 2ccadef (svn revision 360428):"Treehugger Robot
2020-04-28Sync with upstream ffa3961 (svn revision 360359): am: 05ca3f4d04Xin Li
Change-Id: I108069a860bedb0edc799f6b1bef61f4c600f94a
2020-04-28Sync with upstream ffa3961 (svn revision 360359): am: 05ca3f4d04Xin Li
Change-Id: I82b996c846bd04ecd8c852d399c1ea7d71caadc6
2020-04-28Sync with upstream 2ccadef (svn revision 360428):Xin Li
Do not overflow when calculating file system size. Test: build Bug: 155183047 Change-Id: I05a8f1b3ef10ec6a765a78adf122f274dcda12cd
2020-04-28Import revision 2ccadef77b81e7f18dd6bc4380357d6c6a797c5a from FreeBSD.Xin Li
Change-Id: I7293281cb5d1b0b01163e1f23b36bfb7c31a0a2e
2020-04-27Sync with upstream ffa3961 (svn revision 360359):Xin Li
ffa3961: Fix a bug with dirty file system handling. r356313 broke handling of dirty file system because we have restricted the correction of "odd" byte sequences to checkfat(), and as a result the dirty bit is never cleared. The old fsck_msdosfs code would write FAT twice to fix the dirty bit, which is also not ideal. Fix this by introducing a new rountine, cleardirty() which will perform the set of clean bit only, and use it in checkfilesys() if we thought the file system was dirty. 996c6ae: Use humanize_number to format available and bad space sizes. (Visible change is the addition of KiB suffix in fsck_msdos summary on Android as we don't currently have humanize_number which supports larger numbers) 28bbeac: Diff reduction against NetBSD, no functional change. Bug: 155081558 Test: build Change-Id: I352ad474215fd340399697c0606d69687c8189d1
2020-04-27Merge "Sync with upstream ffa3961 (svn revision 360359):" am: 2282fc83db am: ↵Treehugger Robot
260d7b8a7a am: 7efe0bf656 am: 7b2273145d am: 2563472099 Change-Id: Ib28bd9cccc6b24f86869b4b18690123295ebbc3c
2020-04-27Merge "Sync with upstream ffa3961 (svn revision 360359):" am: 2282fc83db am: ↵Treehugger Robot
260d7b8a7a am: 7efe0bf656 am: 7b2273145d Change-Id: I10db9cc108938c3a3855b288c4d85b81e726c76a
2020-04-27Merge "Sync with upstream ffa3961 (svn revision 360359):" am: 2282fc83db am: ↵Treehugger Robot
260d7b8a7a am: 7efe0bf656 Change-Id: I4981467418ad86b41ed9bbd6cfb87dfb1c0d4657
2020-04-27Merge "Sync with upstream ffa3961 (svn revision 360359):" am: 2282fc83db am: ↵Treehugger Robot
260d7b8a7a Change-Id: I85a9297a7f03c34698de954579fa24b154d7545f
2020-04-27Merge "Sync with upstream ffa3961 (svn revision 360359):" am: 2282fc83dbTreehugger Robot
Change-Id: I646f7e98195ac608968fc7370a361f40002fca84
2020-04-27Merge "Sync with upstream ffa3961 (svn revision 360359):"Treehugger Robot
2020-04-27Sync with upstream ffa3961 (svn revision 360359):Xin Li
ffa3961: Fix a bug with dirty file system handling. r356313 broke handling of dirty file system because we have restricted the correction of "odd" byte sequences to checkfat(), and as a result the dirty bit is never cleared. The old fsck_msdosfs code would write FAT twice to fix the dirty bit, which is also not ideal. Fix this by introducing a new rountine, cleardirty() which will perform the set of clean bit only, and use it in checkfilesys() if we thought the file system was dirty. 996c6ae: Use humanize_number to format available and bad space sizes. (Visible change is the addition of KiB suffix in fsck_msdos summary on Android as we don't currently have humanize_number which supports larger numbers) 28bbeac: Diff reduction against NetBSD, no functional change. Bug: 155081558 Test: build Change-Id: I352ad474215fd340399697c0606d69687c8189d1
2020-04-27Import revision ffa396196c4c0fcf8a6bf4d1dd88ffb9ce531ccc from FreeBSD.Xin Li
Change-Id: Ibbded2a22a581886dd43e0443e786ad867471f1c
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: 6f8213561b -s ours am: 6d34e05e36 am: 4d8189ba9d am: 53a064f95d -s ours am skip reason: subject contains skip directive Change-Id: I46a39a5b7ddb84901f298a2a3ec038f896c78134
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: 6f8213561b -s ours am: 6d34e05e36 am: 4d8189ba9d Change-Id: Iadf5f9cf6e07e7c4579875b4a5db329092d07252
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: 6f8213561b -s ours am: 6d34e05e36 Change-Id: If390d5e32e9e7bc95bfa0612ed0788be03fe7643
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: 6f8213561b -s ours am skip reason: subject contains skip directive Change-Id: Ic6509b92f6ac5db9bfb1d3f06f2f5fbe3b09224a
2020-04-09DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-masterXin Li
Bug: 151763422 Change-Id: I87e4268a576a3874d59f0feee5666ecb210da5e6
2020-03-19[automerger skipped] DO NOT MERGE - Empty merge ↵Xin Li
qt-qpr1-dev-plus-aosp@6304901 into stag-aosp-master am: ba0796b481 -s ours am: f2926def49 am: f58cf9e611 am: dc8a0e9c44 -s ours am skip reason: subject contains skip directive Change-Id: Ieb6463ab83a4b4d73be30fbf2b0ae674b81f32bd
2020-03-19[automerger skipped] DO NOT MERGE - Empty merge ↵Xin Li
qt-qpr1-dev-plus-aosp@6304901 into stag-aosp-master am: ba0796b481 -s ours am: f2926def49 am: f58cf9e611 Change-Id: I8c2158ae33c791b50620dd4e2ec0a016649b2d8b
2020-03-19[automerger skipped] DO NOT MERGE - Empty merge ↵Xin Li
qt-qpr1-dev-plus-aosp@6304901 into stag-aosp-master am: ba0796b481 -s ours am: f2926def49 Change-Id: Ibfdc2c2439faf1733f0ccf3cc1c5e9725a81b5b8
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-15 21:17:15 +0000