Paul Lawrence
7ee87cfcbe
Remove all references to FDE enable wipe
...
Bug: 64766105
Test: FBE boots, forceencrypt boots, set pattern, reboots, encryptable
boots and can be encrypted
Change-Id: I8c6dc0acdc37c3a6f1bea28d5607ed8938a4eb0c
2017-12-22 11:17:15 -08:00
Elliott Hughes
91f1886e14
Merge "StartsWith now allows std::string prefixes."
2017-12-21 15:55:34 +00:00
TreeHugger Robot
24224d10d0
Merge "Break vold dependency on keystore utilities."
2017-12-21 00:52:38 +00:00
Elliott Hughes
32a5b9aed3
StartsWith now allows std::string prefixes.
...
Bug: N/A
Test: builds
Change-Id: I2e24632e95f2bf929c2c000152c5c4076d53186e
2017-12-20 12:38:47 -08:00
Jeff Sharkey
401b260351
Delay touching disks when secure keyguard showing.
...
We've tried our best to protect against malicious storage devices
with limited SELinux domains, but let's be even more paranoid and
refuse to look at disks inserted while a secure keyguard is
showing. We'll gladly scan them right away once the user confirms
their credentials.
Test: builds, boots, manual testing
Bug: 68054513
Change-Id: I37fd6c25bbd6631fa4ba3f84e19384d746a22498
2017-12-15 13:44:55 -07:00
Chih-hung Hsieh
0667b7e7dd
Merge "Fix warning in system/vold/tests." am: b96ed7e6e0 am: 447f1874b4
...
am: c025ce8806
2017-12-11 23:37:26 +00:00
Chih-hung Hsieh
c025ce8806
Merge "Fix warning in system/vold/tests." am: b96ed7e6e0
...
am: 447f1874b4
2017-12-11 23:31:50 +00:00
Chih-hung Hsieh
447f1874b4
Merge "Fix warning in system/vold/tests."
...
am: b96ed7e6e0
2017-12-11 23:28:47 +00:00
Chih-hung Hsieh
b96ed7e6e0
Merge "Fix warning in system/vold/tests."
2017-12-11 23:22:58 +00:00
Xin Li
e3e2c74604
Merge "DO NOT MERGE: Merge Oreo MR1 into master" am: 56b0e8c1df -s ours am: d0271a642a
...
am: 54018cc991
2017-12-08 04:27:44 +00:00
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
2017-12-07 14:18:34 -08:00
Xin Li
43dd997761
DO NOT MERGE: Merge Oreo MR1 into master am: 1843c887d4 -s ours am: 00a2c10b44
...
am: 81daada217
2017-12-07 22:05:05 +00:00
Xin Li
54018cc991
Merge "DO NOT MERGE: Merge Oreo MR1 into master" am: 56b0e8c1df -s ours
...
am: d0271a642a
2017-12-07 19:40:44 +00:00
Xin Li
d0271a642a
Merge "DO NOT MERGE: Merge Oreo MR1 into master"
...
am: 56b0e8c1df
2017-12-07 19:37:04 +00:00
Xin Li
81daada217
DO NOT MERGE: Merge Oreo MR1 into master am: 1843c887d4 -s ours
...
am: 00a2c10b44
2017-12-07 07:26:09 +00:00
Xin Li
00a2c10b44
DO NOT MERGE: Merge Oreo MR1 into master
...
am: 1843c887d4
2017-12-07 04:53:08 +00:00
Gao Xiang
9aec7a2fb6
mFusePid should be cleared after waitpid successfully
...
When waitpid is successful, we need to reset mFusePid
since mFusePid will be killed again unnecessarily
in doUnmount() if we don't reset mFusePid.
As a result, it will kill another unrelated process
in the case of pids wrap around.
Test: reboot
Fixes: 1d79d10
2017-12-07 11:37:19 +08:00
Xin Li
56b0e8c1df
Merge "DO NOT MERGE: Merge Oreo MR1 into master"
2017-12-06 23:18:28 +00:00
Xin Li
1843c887d4
DO NOT MERGE: Merge Oreo MR1 into master
...
Exempt-From-Owner-Approval: Changes already landed internally
Change-Id: Ic7e2e2d1ef7bf17a9c81ea30d759fd9fe0a218c7
2017-12-06 14:24:58 -08:00
Paul Crowley
5afbc6276d
No double encryption on FDE+FBE SD cards
...
On FBE systems, adoptable storage uses both file-based encryption (for
per-user protection) and full disk encryption (for metadata
protection). For performance/battery reasons, we don't want to encrypt
the same data twice; to that end, ensure that the
allow_encrypt_override flag is sent to dm_crypt.
Bug: 25861755
Test: see ag/3247969
Change-Id: Ib0c5891ab2d2ee9007e27a50254d29fc867d7bc5
2017-12-04 14:42:10 -08:00
Colin Cross
b8efb47a7c
Merge "Export AIDL files as a filegroup for framework.jar"
2017-12-02 23:20:42 +00:00
Risan
aedae617fe
[Vold] Conditional dependency to ARC++ ObbVolume
...
Test: Compile
Change-Id: Ic6348f7816b28302d45c05a359548a5d034fde24
Bug: 64500663
2017-11-30 04:24:41 +00:00
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
2017-11-29 19:07:22 +00:00
Pierre-Hugues Husson
130a994f4f
Merge "Workaround perdev_minors path change in Linux" am: d3870c5167 am: 5687befd86
...
am: 77e194d0b9
2017-11-28 19:19:36 +00:00
Pierre-Hugues Husson
77e194d0b9
Merge "Workaround perdev_minors path change in Linux" am: d3870c5167
...
am: 5687befd86
2017-11-28 19:03:30 +00:00
Pierre-Hugues Husson
5687befd86
Merge "Workaround perdev_minors path change in Linux"
...
am: d3870c5167
2017-11-28 18:59:56 +00:00
Treehugger Robot
d3870c5167
Merge "Workaround perdev_minors path change in Linux"
2017-11-28 18:45:30 +00:00
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
2017-11-28 17:53:42 +01:00
Paul Crowley
6699e7b912
Merge "Key upgrading for FDE." am: 997e605563 am: 2b1b72d183
...
am: 78c9969299
2017-11-27 21:05:35 +00:00
Paul Crowley
78c9969299
Merge "Key upgrading for FDE." am: 997e605563
...
am: 2b1b72d183
2017-11-27 21:02:34 +00:00
Paul Crowley
2b1b72d183
Merge "Key upgrading for FDE."
...
am: 997e605563
2017-11-27 20:59:33 +00:00
Treehugger Robot
997e605563
Merge "Key upgrading for FDE."
2017-11-27 20:55:51 +00:00
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
2017-11-27 10:34:18 -08:00
TreeHugger Robot
318b07d7c6
Merge "Vold: format f2fs partition"
2017-11-17 08:03:32 +00:00
TreeHugger Robot
3cb5cbff5a
Merge "Add functions to handle idle maintenance"
2017-11-15 18:47:21 +00:00
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>
2017-11-14 17:52:16 -08:00
Xin Li
1dd13cd558
Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD
...
am: c6d4d2a22d
2017-11-15 01:19:24 +00:00
Xin Li
c6d4d2a22d
Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD
...
Change-Id: Id798fe06c18348b17befbca944afa25f7c514a80
2017-11-14 16:38:31 -08:00
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
2017-11-14 15:12:30 -08:00
Xin Li
bf168f7dad
Merge commit 'e2d1d99f1a98b02a28fe71f2a387a72b69d4b4a6' from
...
oc-mr1-dev-plus-aosp into stage-aosp-master
Change-Id: I4bdada4c933109f1cc60c61946fa30e174ca7583
2017-11-14 12:20:56 -08:00
Jaegeuk Kim
119a98ac1b
Merge "cryptfs: support make_f2fs with quota" am: 7807866abe am: 4d1c7765c8
...
am: 5968445892
2017-11-14 03:33:35 +00:00
Jaegeuk Kim
ab693f201e
Merge "cryptfs: call format_f2fs correctly with proper flags" am: b9a1169eca am: af285d98b8
...
am: e15780494f
2017-11-14 03:33:16 +00:00
Jaegeuk Kim
5968445892
Merge "cryptfs: support make_f2fs with quota" am: 7807866abe
...
am: 4d1c7765c8
2017-11-14 03:03:10 +00:00
Jaegeuk Kim
e15780494f
Merge "cryptfs: call format_f2fs correctly with proper flags" am: b9a1169eca
...
am: af285d98b8
2017-11-14 03:02:43 +00:00
Jaegeuk Kim
4d1c7765c8
Merge "cryptfs: support make_f2fs with quota"
...
am: 7807866abe
2017-11-14 01:10:34 +00:00
Jaegeuk Kim
af285d98b8
Merge "cryptfs: call format_f2fs correctly with proper flags"
...
am: b9a1169eca
2017-11-14 01:10:17 +00:00
Treehugger Robot
7807866abe
Merge "cryptfs: support make_f2fs with quota"
2017-11-14 01:06:37 +00:00
Jaegeuk Kim
b9a1169eca
Merge "cryptfs: call format_f2fs correctly with proper flags"
2017-11-14 01:06:27 +00:00
Jaegeuk Kim
8de9f065a4
cryptfs: support make_f2fs with quota
...
Change-Id: I699b457ca0282c02e0d0a399c146d4e54a403bf4
Signed-off-by: Jaegeuk Kim <jaegeuk@google.com>
2017-11-13 13:54:16 -08:00
Jaegeuk Kim
98651a235b
cryptfs: call format_f2fs correctly with proper flags
...
Change-Id: Ia493e6f758ff5dd5dd41479193ab237d4306d464
Signed-off-by: Jaegeuk Kim <jaegeuk@google.com>
2017-11-13 13:16:45 -08:00
