Chih-hung Hsieh
0667b7e7dd
Merge "Fix warning in system/vold/tests." am: b96ed7e6e0
am: 447f1874b4
...
am: c025ce8806
-s ours
Change-Id: I64cfa78cb57b5d813c34a0eb725a7dce802c7612
7 years ago
Chih-hung Hsieh
c025ce8806
Merge "Fix warning in system/vold/tests." am: b96ed7e6e0
...
am: 447f1874b4
Change-Id: I9e5db0fe14e7701b20c27e0c2074fb23496f59aa
7 years ago
Chih-hung Hsieh
447f1874b4
Merge "Fix warning in system/vold/tests."
...
am: b96ed7e6e0
Change-Id: I0d8dbf26cd9769307adc0a1ce0d4d02a8bff9382
7 years ago
Chih-hung Hsieh
b96ed7e6e0
Merge "Fix warning in system/vold/tests."
7 years ago
Xin Li
e3e2c74604
Merge "DO NOT MERGE: Merge Oreo MR1 into master" am: 56b0e8c1df
-s ours am: d0271a642a
...
am: 54018cc991
-s ours
Change-Id: Ic4cf2efd7603cb01d9bf11be0b0245a8b46a2ac3
7 years ago
Chih-Hung Hsieh
a827f55629
Fix warning in system/vold/tests.
...
* Comment out unused function.
Bug: 66996870
Test: build with WITH_TIDY=1
Change-Id: I18db09be2ff8ef27f822876a6832ca5f08ce939f
Merged-In: I7a23573af0d664a5f39f1cde3a22ac0001dac1ac
7 years ago
Xin Li
43dd997761
DO NOT MERGE: Merge Oreo MR1 into master am: 1843c887d4
-s ours am: 00a2c10b44
...
am: 81daada217
-s ours
Change-Id: I157feb353c48566849a001630ed505dc5911addd
7 years ago
Xin Li
54018cc991
Merge "DO NOT MERGE: Merge Oreo MR1 into master" am: 56b0e8c1df
-s ours
...
am: d0271a642a
Change-Id: Ie7f861c8ba9eca256bfdd1546a3a67ae943cea4d
7 years ago
Xin Li
d0271a642a
Merge "DO NOT MERGE: Merge Oreo MR1 into master"
...
am: 56b0e8c1df
-s ours
Change-Id: I632ac4d7b22928b78579ccd6e99a17c516f18809
7 years ago
Xin Li
81daada217
DO NOT MERGE: Merge Oreo MR1 into master am: 1843c887d4
-s ours
...
am: 00a2c10b44
Change-Id: I5d524667113fd31b78c2932d919d1c23b62caa5b
7 years ago
Xin Li
00a2c10b44
DO NOT MERGE: Merge Oreo MR1 into master
...
am: 1843c887d4
-s ours
Change-Id: Ie3ef381ae67fa4e1761ff96e91fef55a959215d4
7 years ago
Xin Li
56b0e8c1df
Merge "DO NOT MERGE: Merge Oreo MR1 into master"
7 years ago
Xin Li
1843c887d4
DO NOT MERGE: Merge Oreo MR1 into master
...
Exempt-From-Owner-Approval: Changes already landed internally
Change-Id: Ic7e2e2d1ef7bf17a9c81ea30d759fd9fe0a218c7
7 years ago
Colin Cross
b8efb47a7c
Merge "Export AIDL files as a filegroup for framework.jar"
7 years ago
Risan
aedae617fe
[Vold] Conditional dependency to ARC++ ObbVolume
...
Test: Compile
Change-Id: Ic6348f7816b28302d45c05a359548a5d034fde24
Bug: 64500663
7 years ago
Colin Cross
a838863d77
Export AIDL files as a filegroup for framework.jar
...
Put AIDL files into a filegroup so they can be imported as sources
for framework.jar.
Bug: 69917341
Test: m checkbuild
Change-Id: I22e765ccf88832b1b192b42b2161898d9a6e5b2c
7 years ago
Pierre-Hugues Husson
130a994f4f
Merge "Workaround perdev_minors path change in Linux" am: d3870c5167
am: 5687befd86
...
am: 77e194d0b9
Change-Id: If0c043e387629312121dc7d4556c112dc5800201
7 years ago
Pierre-Hugues Husson
77e194d0b9
Merge "Workaround perdev_minors path change in Linux" am: d3870c5167
...
am: 5687befd86
Change-Id: I65e584b3fb56aea64a466afb933d9085ab35117a
7 years ago
Pierre-Hugues Husson
5687befd86
Merge "Workaround perdev_minors path change in Linux"
...
am: d3870c5167
Change-Id: Ia7ec03a566f8c122dff05bcc3d996c05cf2b7771
7 years ago
Treehugger Robot
d3870c5167
Merge "Workaround perdev_minors path change in Linux"
7 years ago
Pierre-Hugues Husson
f347cd0249
Workaround perdev_minors path change in Linux
...
This upstream Linux change has been discussed at https://patchwork.kernel.org/patch/8281851/
And included in AOSP in https://android-review.googlesource.com/c/kernel/common/+/202752
Some devices have been released without it, so we need this change to
have a working SDcard on those devices.
Change-Id: I323d85bd8381f82b75db09493ddc22f432cec548
7 years ago
Paul Crowley
6699e7b912
Merge "Key upgrading for FDE." am: 997e605563
am: 2b1b72d183
...
am: 78c9969299
Change-Id: I85740653a804707faca6becc77a16c3ce9990123
7 years ago
Paul Crowley
78c9969299
Merge "Key upgrading for FDE." am: 997e605563
...
am: 2b1b72d183
Change-Id: I3c88a78565751c17f49c712d6015aad02cfca8f8
7 years ago
Paul Crowley
2b1b72d183
Merge "Key upgrading for FDE."
...
am: 997e605563
Change-Id: If2ca4a6bd3b7a2b36b6c092975bcfdde8e063a3e
7 years ago
Treehugger Robot
997e605563
Merge "Key upgrading for FDE."
7 years ago
Paul Crowley
73473337d8
Key upgrading for FDE.
...
Correctly handle a key upgrade error from keymaster by upgrading the
FDE RSA key and writing the new key blob to disk.
Bug: 69792304
Test: Roll back PLATFORM_SECURITY_PATCH a month, wipe and reboot, roll
forwards again, check logs with and without this patch.
Change-Id: I220d2dd4e3d791f636e9bc5f063064cecbf1b88a
7 years ago
TreeHugger Robot
318b07d7c6
Merge "Vold: format f2fs partition"
7 years ago
TreeHugger Robot
3cb5cbff5a
Merge "Add functions to handle idle maintenance"
7 years ago
Jaegeuk Kim
c7c477b8fb
Vold: format f2fs partition
...
This patch formats f2fs paritition with proper flags.
Change-Id: Ie5ded1f2ceb3869771b2eaf9bea3b0966cab18c5
Signed-off-by: Jaegeuk Kim <jaegeuk@google.com>
7 years ago
Xin Li
1dd13cd558
Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD
...
am: c6d4d2a22d
Change-Id: I65288cb11d5b2a56bcf3e388f1bb4de6d3ee74dd
7 years ago
Xin Li
c6d4d2a22d
Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD
...
Change-Id: Id798fe06c18348b17befbca944afa25f7c514a80
7 years ago
Jin Qian
a370c14f75
Add functions to handle idle maintenance
...
runIdleMaint is equivalent with:
1. echo 1 > /sys/fs/f2fs/sdX/gc_urgent
2. wait until /sys/fs/f2fs/sdX/dirty_segments
<= threshold or timeout
3. echo 0 > /sys/fs/f2fs/sdX/gc_urgent
4. fstrim
abortIdleMaint forces the wait loop above to exit and
skips fstrim. However, if fstrim is already running,
abortIdleMaint will just leave it run to completion.
Test: adb shell sm idle-maint [run|abort]
Bug: 67776637
Change-Id: I4adff8d9b6bbd63bce41368cea55dc9e9b117eb6
7 years ago
Xin Li
bf168f7dad
Merge commit 'e2d1d99f1a98b02a28fe71f2a387a72b69d4b4a6' from
...
oc-mr1-dev-plus-aosp into stage-aosp-master
Change-Id: I4bdada4c933109f1cc60c61946fa30e174ca7583
7 years ago
Jaegeuk Kim
119a98ac1b
Merge "cryptfs: support make_f2fs with quota" am: 7807866abe
am: 4d1c7765c8
...
am: 5968445892
Change-Id: Id898a24124eeafdcc1abdaafc4864d795f6fd340
7 years ago
Jaegeuk Kim
ab693f201e
Merge "cryptfs: call format_f2fs correctly with proper flags" am: b9a1169eca
am: af285d98b8
...
am: e15780494f
Change-Id: I5e08076759e8ba4d35c76d9da19e6607e5515958
7 years ago
Jaegeuk Kim
5968445892
Merge "cryptfs: support make_f2fs with quota" am: 7807866abe
...
am: 4d1c7765c8
Change-Id: Ica0836d567049774eeaf41d7f75d5cd83045edfe
7 years ago
Jaegeuk Kim
e15780494f
Merge "cryptfs: call format_f2fs correctly with proper flags" am: b9a1169eca
...
am: af285d98b8
Change-Id: Ia40ec01d0685769d3af5cfeeb6a76673a07dd003
7 years ago
Jaegeuk Kim
4d1c7765c8
Merge "cryptfs: support make_f2fs with quota"
...
am: 7807866abe
Change-Id: I9b52d87df0a6ddc3c29b4bd5d302e300747ad4c1
7 years ago
Jaegeuk Kim
af285d98b8
Merge "cryptfs: call format_f2fs correctly with proper flags"
...
am: b9a1169eca
Change-Id: I7ad4229ee514d80fc3280d8f468844a3b5eb9137
7 years ago
Treehugger Robot
7807866abe
Merge "cryptfs: support make_f2fs with quota"
7 years ago
Jaegeuk Kim
b9a1169eca
Merge "cryptfs: call format_f2fs correctly with proper flags"
7 years ago
Jaegeuk Kim
8de9f065a4
cryptfs: support make_f2fs with quota
...
Change-Id: I699b457ca0282c02e0d0a399c146d4e54a403bf4
Signed-off-by: Jaegeuk Kim <jaegeuk@google.com>
7 years ago
Jaegeuk Kim
98651a235b
cryptfs: call format_f2fs correctly with proper flags
...
Change-Id: Ia493e6f758ff5dd5dd41479193ab237d4306d464
Signed-off-by: Jaegeuk Kim <jaegeuk@google.com>
7 years ago
Wei Wang
a087947490
Vold: Add fsync in writeStringToFile() am: 701d05d32c
...
am: ee8170f2ac
Change-Id: I2ce9e9a6ea1969e1bf41ef6886dc4d27ee19f58a
7 years ago
Wei Wang
ee8170f2ac
Vold: Add fsync in writeStringToFile()
...
am: 701d05d32c
Change-Id: I24ab82c29abd56e35d1016b2b3aa0e199528efb3
7 years ago
Wei Wang
701d05d32c
Vold: Add fsync in writeStringToFile()
...
Test: Build, test with ag/3180275
Bug: 68901441
Change-Id: Ieca9e5227025e00184a67508d5e8fbbddd12f21e
7 years ago
Jeff Sharkey
cbcb2926b2
Abort long-running benchmarks, report progress.
...
A typical storage device finishes the benchmark in under 10 seconds,
but some extremely slow devices can take minutes, resulting in a
confusing UX that looks like we've frozen. Even worse, we keep
churning through all that I/O even though we know the device will
blow past our user-warning threshold.
So periodically check if we've timed out, and also use that to report
progress up into the Settings UI.
Test: manual
Bug: 62201209, 65639764, 67055204
Change-Id: I321397bcff230976f034cede0947d4a5a1f3e8a7
7 years ago
Paul Crowley
b64933a502
Be even more C++. Switch on a warning.
...
Remove lots of "extern C" and "ifdef __cplusplus" which are no longer
needed now all of vold is C++. Also turn on the cert-err58-cpp warning
we once had to disable.
Bug: 67041047
Test: compiles, boots
Change-Id: I8c6f9dd486f2409e0deed7bb648d959677465b21
7 years ago
Jeff Sharkey
2048a2865c
Test that plaintext can't be read from disk for encrypted files.
...
Bug: 36029169
Test: tested by hand on Taimen
Change-Id: I5717a8630bb2c8d8fe5c343d519c4e59862ecbdf
7 years ago
Paul Crowley
2d64b91823
Improve VDC's logging on failure.
...
Also refactor.
Bug: 36029169
Test: ensure that a command fails, check logs for failure.
Change-Id: I1dece2982f762f4522e17d45b5f04af104b95861
7 years ago