OSDN Git Service
android-build-team Robot [Mon, 5 Feb 2018 08:20:26 +0000 (08:20 +0000)]
Snap for
4585119 from
0fd2626fc3457e4013a9949190c45aa5fb00c5d3 to pi-release
Change-Id: I30f48b47e54a2ee02fd3e2a1adab9ed3ff96c189
Paul Crowley [Tue, 30 Jan 2018 17:48:19 +0000 (09:48 -0800)]
Add a mount with metadata encryption service
Don't use the FDE flow to support metadata encryption; just provide a
vold service which directly mounts the volume and use that.
Bug:
63927601
Test: Boot Taimen to SUW with and without metadata encryption.
Change-Id: Ifc6a012c02c0ea66893020ed1d0da4cba6914aed
Paul Crowley [Thu, 1 Feb 2018 17:53:27 +0000 (09:53 -0800)]
Refactor logging in EncryptInplace.cpp
Done as part of work towards metadata encryption.
Bug:
63927601
Test: Boot Taimen to SUW
Change-Id: I0f5fda0e002944ab658756c7cfcb386c3658a446
gitbuildkicker [Mon, 29 Jan 2018 22:55:13 +0000 (14:55 -0800)]
merge in pi-release history after reset to master
gitbuildkicker [Mon, 29 Jan 2018 19:59:01 +0000 (11:59 -0800)]
merge in pi-release history after reset to master
android-build-team Robot [Sun, 28 Jan 2018 08:27:54 +0000 (08:27 +0000)]
Snap for
4571561 from
353518194e520a0f78be9f2361939a2dffa9aae9 to pi-release
Change-Id: I1d2503cb28183b042e6b46fccc51038246fb513a
Shawn Willden [Mon, 22 Jan 2018 16:08:32 +0000 (09:08 -0700)]
Support Keymaster4
This CL changes vold from using a KM3 device directly to using the KM4
support wrapper from the KM4 support library, which supports both KM3
and KM4 devices (KM0, 1 and 2 devices are still supported as well,
because the default KM3 device is a wrapper that uses them).
In addition, I found myself getting confused about which "Keymaster"
types were locally-defined vold keymaster types and which were from
the KM4 HAL and support library, so I changd the approach to
referencing the latter, so all of them are qualified with the "km::"
namespace reference.
Test: Build & boot
Change-Id: I08ed5425641e7496f8597d5716cb3cd0cbd33a7f
Shawn Willden [Sat, 20 Jan 2018 16:37:36 +0000 (09:37 -0700)]
Clang-format Key{cpp|h} and KeyStorage.{cpp|h}
Test: Build & boot
Change-Id: I92bb107409f493770028cf6fd637d34af7644262
android-build-team Robot [Thu, 25 Jan 2018 09:05:28 +0000 (09:05 +0000)]
Snap for
4565898 from
71cd43f4340209780d441c234b3846646705e948 to pi-release
Change-Id: Iaeedc50d213b30d57c952a81fb2bcf10fdc325ac
Andreas Huber [Mon, 22 Jan 2018 19:25:29 +0000 (11:25 -0800)]
Fingerprint data is now stored in one of two ways depending on the
shipping API version:
For devices shipped before Android P nothing changes, data
is stored under /data/system/users/<user-id>/fpdata/...
Devices shipped from now on will instead store
fingerprint data under /data/vendor_de/<user-id>/fpdata.
Support for /data/vendor_de and /data/vendor_ce has been added to vold.
Bug:
36997597
Change-Id: I615e90d1c9ab08e768a8713968fa043598a0a526
Test: manually
gitbuildkicker [Tue, 23 Jan 2018 22:20:33 +0000 (14:20 -0800)]
merge in pi-release history after reset to master
gitbuildkicker [Tue, 23 Jan 2018 20:15:13 +0000 (12:15 -0800)]
merge in pi-release history after reset to master
android-build-team Robot [Tue, 23 Jan 2018 08:25:59 +0000 (08:25 +0000)]
Snap for
4560043 from
9929e7db3236070a6371ca9535085343a8d6a467 to pi-release
Change-Id: I78d8f23819024345050fa06c28cf7ea9491017df
gitbuildkicker [Tue, 23 Jan 2018 06:28:43 +0000 (22:28 -0800)]
merge in pi-release history after reset to master
gitbuildkicker [Tue, 23 Jan 2018 00:33:49 +0000 (16:33 -0800)]
merge in pi-release history after reset to master
Risan [Mon, 22 Jan 2018 02:04:25 +0000 (11:04 +0900)]
[VOLD] Add ARC++ ObbMount shared lib
Unfortunately, static library dependency is not transitive (even if the
dependency is a shared library). So I am wrapping the libarcobbvolume's
dependency as libarcmounter shared library.
Bug:
64500663
Test: Compile
Change-Id: I12be7a9d885c7c1c043185bd134e0148d420c6fd
android-build-team Robot [Sun, 21 Jan 2018 08:22:21 +0000 (08:22 +0000)]
Snap for
4557233 from
37ba125205023b3b6e80ed684ca4d282224c66dc to pi-release
Change-Id: I38f4a6c6d0a593423e6baf6bdd29c0f6aa078452
Jeff Sharkey [Fri, 19 Jan 2018 01:55:18 +0000 (10:55 +0900)]
Add basic exFAT support.
Several partners have been requesting exFAT support. Android doesn't
natively support exFAT, but we're at least willing to try mounting an
exFAT filesystem if we detect the Linux kernel supports it, and if
helper binaries are present.
This CL is simple scaffolding, and it provides no actual
implementation of exFAT.
Test: builds, boots
Bug:
67822822
Change-Id: Id4f8ec3967b32de6e1c0e3c4b47fe6e43a6291ab
android-build-team Robot [Thu, 18 Jan 2018 08:22:34 +0000 (08:22 +0000)]
Snap for
4551672 from
a8b6225578b92af9f4b1e6852122c2377f7fe71d to pi-release
Change-Id: I56089df824e741aa08c1c55fd5787d7f679c3c61
TreeHugger Robot [Thu, 18 Jan 2018 01:39:19 +0000 (01:39 +0000)]
Merge "No double encryption on FDE+FBE SD cards"
android-build-team Robot [Sun, 14 Jan 2018 08:36:49 +0000 (08:36 +0000)]
Snap for
4545621 from
856f7cf20e06422ce295d3f2d7adf918401ce0b9 to pi-release
Change-Id: I213fbe08b8f8ef7567055c62a99e62ba7aa00ce0
Jeff Sharkey [Sat, 13 Jan 2018 02:12:30 +0000 (02:12 +0000)]
Merge "Add "default_normal" support to vold."
Jeff Sharkey [Fri, 12 Jan 2018 20:51:43 +0000 (20:51 +0000)]
Merge "Remove FIDTRIM." am:
35829f3968 am:
c1d81682e1
am:
bf0ab0439c -s ours
Change-Id: I9ad9f730409747a0c8b724bdb81eb93802425309
Jeff Sharkey [Fri, 12 Jan 2018 20:48:45 +0000 (20:48 +0000)]
Merge "Remove FIDTRIM." am:
35829f3968
am:
c1d81682e1
Change-Id: Ic16dc5e6347a5cfbe444401b5374c7682db551e4
Jeff Sharkey [Fri, 12 Jan 2018 20:43:37 +0000 (20:43 +0000)]
Merge "Remove FIDTRIM."
am:
35829f3968
Change-Id: I02bb4438d08a34cf0f8e41a8a7fd2123c492be38
Jeff Sharkey [Fri, 12 Jan 2018 20:20:15 +0000 (20:20 +0000)]
Merge "Remove FIDTRIM."
Jeff Sharkey [Fri, 12 Jan 2018 17:42:13 +0000 (10:42 -0700)]
Remove FIDTRIM.
Remove FIDTRIM support, which isn't meaningful on UFS-based flash
devices. Modern devices require FBE/FDE which gives us better
protection against trimmed data lingering around.
Bug:
67041047
Test: builds, boots
Change-Id: I38d7d6961edf2047592b87c74b2a0f5906fb54e2
Merged-In: I4fb194c5d5ef13f413c02acedfbaaf79c567582b
android-build-team Robot [Wed, 10 Jan 2018 08:21:45 +0000 (08:21 +0000)]
Snap for
4535700 from
f70cc79eb14b75db9c0da077a4d54bd00fbdfc99 to pi-release
Change-Id: Ia2ef2cb89ce2a3cee14ab95139b2c79297bf9cb8
Jeff Sharkey [Tue, 9 Jan 2018 19:27:40 +0000 (19:27 +0000)]
Merge "Grant "disk_reserved" GID to critical services."
android-build-team Robot [Tue, 9 Jan 2018 08:30:22 +0000 (08:30 +0000)]
Snap for
4533842 from
36dd22967572bc70d95bfbd83cbb8ceae8290c9c to pi-release
Change-Id: I0f5f98b87932be78e9a9806586c04f628628cf44
Jeff Sharkey [Tue, 9 Jan 2018 05:40:53 +0000 (05:40 +0000)]
Merge "Wire up reserved blocks presence for tests."
TreeHugger Robot [Mon, 8 Jan 2018 18:59:45 +0000 (18:59 +0000)]
Merge "Remove all references to FDE enable wipe"
Jeff Sharkey [Mon, 8 Jan 2018 18:48:07 +0000 (11:48 -0700)]
Add "default_normal" support to vold.
This new flag isolates each user on a multi-user device for security
reasons.
Test: cts-tradefed run commandAndExit cts-dev -m CtsAppSecurityHostTestCases -t android.appsecurity.cts.ExternalStorageHostTest#testSecondaryUsersInaccessible
Bug:
64672411
Change-Id: I3db8dde597a7715ca680779ac57957fb12a92f8e
Jeff Sharkey [Mon, 8 Jan 2018 17:43:00 +0000 (10:43 -0700)]
Wire up reserved blocks presence for tests.
This is how we tell CTS if the device has reserved blocks set aside
for system critical services.
Test: builds, boots
Bug:
62024591
Change-Id: I7c8ec2294b246eed54668b5717df00e72f13887a
Jeff Sharkey [Fri, 31 Mar 2017 23:19:57 +0000 (17:19 -0600)]
Grant "disk_reserved" GID to critical services.
This GID extends the ability to use reserved disk space, giving the
system a chance to be usable enough for the user to free up disk
space used by apps.
Test: builds, boots
Bug:
62024591
Change-Id: I8bc47911a71e1f399616caae83678e2914781c7e
android-build-team Robot [Sun, 7 Jan 2018 08:30:44 +0000 (08:30 +0000)]
Snap for
4531101 from
8c24ae7c47efa9e0a504dd97e54e9a2ccc972aff to pi-release
Change-Id: I2003aad4dfc59a7929bf1045f3c1b1576816cff0
Jeff Sharkey [Thu, 4 Jan 2018 23:46:34 +0000 (16:46 -0700)]
FBE devices now fully support adoptable storage.
We've finished all the underlying work to support adoptable storage
on FBE devices, so remove the code that was disabling it by default.
To aid debugging, support blocking move commands (so that we log
the stdout) via a system property, so we don't have to recompile
end user devices stuck in funky states.
Test: cts-tradefed run commandAndExit cts-dev -m CtsAppSecurityHostTestCases -t android.appsecurity.cts.AdoptableHostTest
Bug:
29923055,
25861755,
33252673,
37289651
Change-Id: I6b781de7e196a1a50ba543843aca0caf74c3e282
android-build-team Robot [Sun, 24 Dec 2017 08:22:45 +0000 (08:22 +0000)]
Snap for
4517567 from
91f1886e14e7fc2b349520d8b5b5777ba5de92f6 to pi-release
Change-Id: I245e1c2aeb7f91ef84887fe52d22ed64bb880d80
Paul Lawrence [Fri, 22 Dec 2017 18:12:06 +0000 (10:12 -0800)]
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
Elliott Hughes [Thu, 21 Dec 2017 15:55:34 +0000 (15:55 +0000)]
Merge "StartsWith now allows std::string prefixes."
TreeHugger Robot [Thu, 21 Dec 2017 00:52:38 +0000 (00:52 +0000)]
Merge "Break vold dependency on keystore utilities."
Elliott Hughes [Wed, 20 Dec 2017 20:38:47 +0000 (12:38 -0800)]
StartsWith now allows std::string prefixes.
Bug: N/A
Test: builds
Change-Id: I2e24632e95f2bf929c2c000152c5c4076d53186e
android-build-team Robot [Sun, 17 Dec 2017 08:33:36 +0000 (08:33 +0000)]
Snap for
4507345 from
401b2603516a64d3ee7804e270c966828e6b454a to pi-release
Change-Id: Ib2cc93b71e7852ea4db9ca4e72a71eec18a309bd
Jeff Sharkey [Fri, 15 Dec 2017 05:15:20 +0000 (22:15 -0700)]
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
android-build-team Robot [Tue, 12 Dec 2017 08:33:28 +0000 (08:33 +0000)]
Snap for
4498106 from
0667b7e7ddb797a6b5dae029f3c7a50d5ca10977 to pi-release
Change-Id: I04865b69d2db90258df3b922e151af27f7ff637f
Chih-hung Hsieh [Mon, 11 Dec 2017 23:37:26 +0000 (23:37 +0000)]
Merge "Fix warning in system/vold/tests." am:
b96ed7e6e0 am:
447f1874b4
am:
c025ce8806 -s ours
Change-Id: I64cfa78cb57b5d813c34a0eb725a7dce802c7612
Chih-hung Hsieh [Mon, 11 Dec 2017 23:31:50 +0000 (23:31 +0000)]
Merge "Fix warning in system/vold/tests." am:
b96ed7e6e0
am:
447f1874b4
Change-Id: I9e5db0fe14e7701b20c27e0c2074fb23496f59aa
Chih-hung Hsieh [Mon, 11 Dec 2017 23:28:47 +0000 (23:28 +0000)]
Merge "Fix warning in system/vold/tests."
am:
b96ed7e6e0
Change-Id: I0d8dbf26cd9769307adc0a1ce0d4d02a8bff9382
Chih-hung Hsieh [Mon, 11 Dec 2017 23:22:58 +0000 (23:22 +0000)]
Merge "Fix warning in system/vold/tests."
android-build-team Robot [Mon, 11 Dec 2017 12:17:21 +0000 (12:17 +0000)]
Snap for
4496165 from
e3e2c74604a1f9cb4e5d2230f5396549e931bcbd to pi-release
Change-Id: I63fb04f087a62f7f51f1125c35c9a73de336b655
Xin Li [Fri, 8 Dec 2017 04:27:44 +0000 (04:27 +0000)]
Merge "DO NOT MERGE: Merge Oreo MR1 into master" am:
56b0e8c1df -s ours am:
d0271a642a
am:
54018cc991 -s ours
Change-Id: Ic4cf2efd7603cb01d9bf11be0b0245a8b46a2ac3
Chih-Hung Hsieh [Thu, 7 Dec 2017 22:18:34 +0000 (14:18 -0800)]
Fix warning in system/vold/tests.
* Comment out unused function.
Bug:
66996870
Test: build with WITH_TIDY=1
Change-Id: I18db09be2ff8ef27f822876a6832ca5f08ce939f
Merged-In: I7a23573af0d664a5f39f1cde3a22ac0001dac1ac
Xin Li [Thu, 7 Dec 2017 22:05:05 +0000 (22:05 +0000)]
DO NOT MERGE: Merge Oreo MR1 into master am:
1843c887d4 -s ours am:
00a2c10b44
am:
81daada217 -s ours
Change-Id: I157feb353c48566849a001630ed505dc5911addd
Xin Li [Thu, 7 Dec 2017 19:40:44 +0000 (19:40 +0000)]
Merge "DO NOT MERGE: Merge Oreo MR1 into master" am:
56b0e8c1df -s ours
am:
d0271a642a
Change-Id: Ie7f861c8ba9eca256bfdd1546a3a67ae943cea4d
Xin Li [Thu, 7 Dec 2017 19:37:04 +0000 (19:37 +0000)]
Merge "DO NOT MERGE: Merge Oreo MR1 into master"
am:
56b0e8c1df -s ours
Change-Id: I632ac4d7b22928b78579ccd6e99a17c516f18809
Xin Li [Thu, 7 Dec 2017 07:26:09 +0000 (07:26 +0000)]
DO NOT MERGE: Merge Oreo MR1 into master am:
1843c887d4 -s ours
am:
00a2c10b44
Change-Id: I5d524667113fd31b78c2932d919d1c23b62caa5b
Xin Li [Thu, 7 Dec 2017 04:53:08 +0000 (04:53 +0000)]
DO NOT MERGE: Merge Oreo MR1 into master
am:
1843c887d4 -s ours
Change-Id: Ie3ef381ae67fa4e1761ff96e91fef55a959215d4
Xin Li [Wed, 6 Dec 2017 23:18:28 +0000 (23:18 +0000)]
Merge "DO NOT MERGE: Merge Oreo MR1 into master"
Xin Li [Wed, 6 Dec 2017 19:52:23 +0000 (11:52 -0800)]
DO NOT MERGE: Merge Oreo MR1 into master
Exempt-From-Owner-Approval: Changes already landed internally
Change-Id: Ic7e2e2d1ef7bf17a9c81ea30d759fd9fe0a218c7
Paul Crowley [Mon, 27 Nov 2017 17:42:17 +0000 (09:42 -0800)]
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
android-build-team Robot [Sun, 3 Dec 2017 08:25:49 +0000 (08:25 +0000)]
Snap for
4481641 from
b8efb47a7c618323b15824bfc9700c68f8cb404c to pi-release
Change-Id: Icf8196f807bee5508fd0da9c0d48d989073d1b63
Colin Cross [Sat, 2 Dec 2017 23:20:42 +0000 (23:20 +0000)]
Merge "Export AIDL files as a filegroup for framework.jar"
android-build-team Robot [Thu, 30 Nov 2017 09:05:04 +0000 (09:05 +0000)]
Snap for
4476081 from
aedae617fec702add64201534a2f514fa31c5965 to pi-release
Change-Id: I1c20cb1fd8ac2f741d18a5828ce2fdcddb8e7931
Risan [Mon, 27 Nov 2017 09:01:35 +0000 (18:01 +0900)]
[Vold] Conditional dependency to ARC++ ObbVolume
Test: Compile
Change-Id: Ic6348f7816b28302d45c05a359548a5d034fde24
Bug:
64500663
Colin Cross [Sat, 25 Nov 2017 16:47:19 +0000 (08:47 -0800)]
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
android-build-team Robot [Wed, 29 Nov 2017 08:33:12 +0000 (08:33 +0000)]
Snap for
4473011 from
130a994f4f5fee84f1321409518893186acb71b8 to pi-release
Change-Id: I51e2425a5dc3026f24aff41bb5de7c0dcb44d61e
Pierre-Hugues Husson [Tue, 28 Nov 2017 19:19:36 +0000 (19:19 +0000)]
Merge "Workaround perdev_minors path change in Linux" am:
d3870c5167 am:
5687befd86
am:
77e194d0b9
Change-Id: If0c043e387629312121dc7d4556c112dc5800201
Pierre-Hugues Husson [Tue, 28 Nov 2017 19:03:30 +0000 (19:03 +0000)]
Merge "Workaround perdev_minors path change in Linux" am:
d3870c5167
am:
5687befd86
Change-Id: I65e584b3fb56aea64a466afb933d9085ab35117a
Pierre-Hugues Husson [Tue, 28 Nov 2017 18:59:56 +0000 (18:59 +0000)]
Merge "Workaround perdev_minors path change in Linux"
am:
d3870c5167
Change-Id: Ia7ec03a566f8c122dff05bcc3d996c05cf2b7771
Treehugger Robot [Tue, 28 Nov 2017 18:45:30 +0000 (18:45 +0000)]
Merge "Workaround perdev_minors path change in Linux"
Pierre-Hugues Husson [Tue, 28 Nov 2017 14:42:56 +0000 (15:42 +0100)]
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
android-build-team Robot [Tue, 28 Nov 2017 08:28:43 +0000 (08:28 +0000)]
Snap for
4471243 from
6699e7b9126a741e26ac1653b4d2df2c8b3dcb1b to pi-release
Change-Id: I7b4235a122171c45f6be6e91b0d65bab5175395b
Paul Crowley [Mon, 27 Nov 2017 21:05:35 +0000 (21:05 +0000)]
Merge "Key upgrading for FDE." am:
997e605563 am:
2b1b72d183
am:
78c9969299
Change-Id: I85740653a804707faca6becc77a16c3ce9990123
Paul Crowley [Mon, 27 Nov 2017 21:02:34 +0000 (21:02 +0000)]
Merge "Key upgrading for FDE." am:
997e605563
am:
2b1b72d183
Change-Id: I3c88a78565751c17f49c712d6015aad02cfca8f8
Paul Crowley [Mon, 27 Nov 2017 20:59:33 +0000 (20:59 +0000)]
Merge "Key upgrading for FDE."
am:
997e605563
Change-Id: If2ca4a6bd3b7a2b36b6c092975bcfdde8e063a3e
Treehugger Robot [Mon, 27 Nov 2017 20:55:51 +0000 (20:55 +0000)]
Merge "Key upgrading for FDE."
Paul Crowley [Tue, 21 Nov 2017 23:43:51 +0000 (15:43 -0800)]
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
android-build-team Robot [Sun, 19 Nov 2017 08:30:22 +0000 (08:30 +0000)]
Snap for
4459973 from
318b07d7c6be801fa3afacb57d3a115423be9973 to pi-release
Change-Id: Ia2179b41c8ef84a7e10f886041996d8644fedc4a
TreeHugger Robot [Fri, 17 Nov 2017 08:03:32 +0000 (08:03 +0000)]
Merge "Vold: format f2fs partition"
android-build-team Robot [Thu, 16 Nov 2017 08:23:10 +0000 (08:23 +0000)]
Snap for
4455093 from
3cb5cbff5aedcbf7ab4bb66a02fd2977047bb7df to pi-release
Change-Id: Ibb7427b4742a3615bedef38909b9e2881f02a8ae
TreeHugger Robot [Wed, 15 Nov 2017 18:47:21 +0000 (18:47 +0000)]
Merge "Add functions to handle idle maintenance"
android-build-team Robot [Wed, 15 Nov 2017 08:35:50 +0000 (08:35 +0000)]
Snap for
4453288 from
1dd13cd55867c3d2b759b90865799c90ddae3f23 to pi-release
Change-Id: I997c20617e0c56c9263df4c752c99f9af95e42c9
Jaegeuk Kim [Tue, 14 Nov 2017 01:38:39 +0000 (17:38 -0800)]
Vold: format f2fs partition
This patch formats f2fs paritition with proper flags.
Change-Id: Ie5ded1f2ceb3869771b2eaf9bea3b0966cab18c5
Signed-off-by: Jaegeuk Kim <jaegeuk@google.com>
Xin Li [Wed, 15 Nov 2017 01:19:24 +0000 (01:19 +0000)]
Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD
am:
c6d4d2a22d
Change-Id: I65288cb11d5b2a56bcf3e388f1bb4de6d3ee74dd
Xin Li [Wed, 15 Nov 2017 00:38:31 +0000 (16:38 -0800)]
Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD
Change-Id: Id798fe06c18348b17befbca944afa25f7c514a80
Jin Qian [Tue, 17 Oct 2017 22:41:45 +0000 (15:41 -0700)]
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
Xin Li [Tue, 14 Nov 2017 20:20:56 +0000 (12:20 -0800)]
Merge commit '
e2d1d99f1a98b02a28fe71f2a387a72b69d4b4a6' from
oc-mr1-dev-plus-aosp into stage-aosp-master
Change-Id: I4bdada4c933109f1cc60c61946fa30e174ca7583
android-build-team Robot [Tue, 14 Nov 2017 08:29:30 +0000 (08:29 +0000)]
Snap for
4450504 from
119a98ac1b93e160067ed78a225bd895d5763fe3 to pi-release
Change-Id: I556f104624e87d7b0d26235abb6e7c4f535ee1f3
Jaegeuk Kim [Tue, 14 Nov 2017 03:33:35 +0000 (03:33 +0000)]
Merge "cryptfs: support make_f2fs with quota" am:
7807866abe am:
4d1c7765c8
am:
5968445892
Change-Id: Id898a24124eeafdcc1abdaafc4864d795f6fd340
Jaegeuk Kim [Tue, 14 Nov 2017 03:33:16 +0000 (03:33 +0000)]
Merge "cryptfs: call format_f2fs correctly with proper flags" am:
b9a1169eca am:
af285d98b8
am:
e15780494f
Change-Id: I5e08076759e8ba4d35c76d9da19e6607e5515958
Jaegeuk Kim [Tue, 14 Nov 2017 03:03:10 +0000 (03:03 +0000)]
Merge "cryptfs: support make_f2fs with quota" am:
7807866abe
am:
4d1c7765c8
Change-Id: Ica0836d567049774eeaf41d7f75d5cd83045edfe
Jaegeuk Kim [Tue, 14 Nov 2017 03:02:43 +0000 (03:02 +0000)]
Merge "cryptfs: call format_f2fs correctly with proper flags" am:
b9a1169eca
am:
af285d98b8
Change-Id: Ia40ec01d0685769d3af5cfeeb6a76673a07dd003
Jaegeuk Kim [Tue, 14 Nov 2017 01:10:34 +0000 (01:10 +0000)]
Merge "cryptfs: support make_f2fs with quota"
am:
7807866abe
Change-Id: I9b52d87df0a6ddc3c29b4bd5d302e300747ad4c1
Jaegeuk Kim [Tue, 14 Nov 2017 01:10:17 +0000 (01:10 +0000)]
Merge "cryptfs: call format_f2fs correctly with proper flags"
am:
b9a1169eca
Change-Id: I7ad4229ee514d80fc3280d8f468844a3b5eb9137
Treehugger Robot [Tue, 14 Nov 2017 01:06:37 +0000 (01:06 +0000)]
Merge "cryptfs: support make_f2fs with quota"
Jaegeuk Kim [Tue, 14 Nov 2017 01:06:27 +0000 (01:06 +0000)]
Merge "cryptfs: call format_f2fs correctly with proper flags"
Jaegeuk Kim [Wed, 1 Nov 2017 17:35:30 +0000 (10:35 -0700)]
cryptfs: support make_f2fs with quota
Change-Id: I699b457ca0282c02e0d0a399c146d4e54a403bf4
Signed-off-by: Jaegeuk Kim <jaegeuk@google.com>
Jaegeuk Kim [Mon, 5 Jun 2017 17:22:04 +0000 (10:22 -0700)]
cryptfs: call format_f2fs correctly with proper flags
Change-Id: Ia493e6f758ff5dd5dd41479193ab237d4306d464
Signed-off-by: Jaegeuk Kim <jaegeuk@google.com>
Shawn Willden [Thu, 9 Nov 2017 22:59:39 +0000 (15:59 -0700)]
Break vold dependency on keystore utilities.
This is temporary. Keystore is in the process of being upgraded to use
the new Keymaster 4.0 HAL, and I want to leave vold alone, using
Keymaster 3.0 for the moment. This CL just copies relevant bits of
keystore support utilities into vold, so it can stop depending on the
copies from keystore.
After the keystore update is complete, vold will be changed either to
use Keymaster 4.0 or -- more likely -- to use keystore rather than
talking to Keymaster directly. At that point the files added by this CL
will be deleted.
Test: Device boots and successfully decrypts /data
Change-Id: I73f6d4cc4c5e20d89d7ac37d29d025bf279f9e12
android-build-team Robot [Thu, 9 Nov 2017 08:33:12 +0000 (08:33 +0000)]
Snap for
4442369 from
a0879474908178c53fde09ee1ff9fa6b48931b09 to pi-release
Change-Id: Ifae71b400fc5ac3531d3e7dd3ba29c1dff96cacb
OSDN Git Service
