Paul Lawrence
5c18a67579
Merge commit 'd0b4295c' into manualmerge
...
Change-Id: I6d7178edebf50663fa9622b539c8101627a84385
9 years ago
Paul Lawrence
d0b4295ccc
Move crypt commands to a different listener in vold
...
In order to prevent this bug from happening, we must allow vold cryptfs
commands to complete while a long running mount is underway.
While waiting for vold to be changed to a binder interface, we will simply
create two listeners, one for cryptfs and one for everything else.
Bug: 19197175
Change-Id: If74142aa81abd58f718a9de6c9e387f6ea442754
9 years ago
Paul Lawrence
3b5fa8a68e
am d095d867: am 0628fa25: Improve boot time
...
* commit 'd095d86705a42186c906db58486575b2d9060de6':
Improve boot time
9 years ago
Paul Lawrence
d095d86705
am 0628fa25: Improve boot time
...
* commit '0628fa25141261e549f06d1c6f9e9f3d29e2b8f0':
Improve boot time
9 years ago
Paul Lawrence
0628fa2514
Improve boot time
...
Bug: 21516860
Change-Id: I3153c7f9a414a8eeadc0118f0a642ad8e96c81ce
9 years ago
Paul Crowley
eebf44563b
Add "cryptfs deleteuserkey" command to vold.
...
Bug: 19706593
Change-Id: I8c97f23316d1a122e24e7627a0422fa180504ba1
9 years ago
Elliott Hughes
e1762fa8e0
am bb68c6f5: am d25e1074: Merge "Don\'t use TEMP_FAILURE_RETRY on close in vold." into mnc-dev
...
* commit 'bb68c6f57647a572808445ca3852a2b80e9ad91f':
Don't use TEMP_FAILURE_RETRY on close in vold.
9 years ago
Paul Lawrence
5225306843
am 9a795187: (-s ours) am 86c942a2: (-s ours) DO NOT MERGE Delete password as per block encryption
...
* commit '9a795187ee7cd75cf5398c8e7f3c6137a1913853':
DO NOT MERGE Delete password as per block encryption
9 years ago
Elliott Hughes
bb68c6f576
am d25e1074: Merge "Don\'t use TEMP_FAILURE_RETRY on close in vold." into mnc-dev
...
* commit 'd25e10744026e85e86e22ace8ec939611be3f367':
Don't use TEMP_FAILURE_RETRY on close in vold.
9 years ago
Paul Lawrence
9a795187ee
am 86c942a2: (-s ours) DO NOT MERGE Delete password as per block encryption
...
* commit '86c942a2537701a90b88768eab4648c0650dfad1':
DO NOT MERGE Delete password as per block encryption
9 years ago
Paul Lawrence
ed29fe34a9
am 4efa3d27: (-s ours) am 0d9cd9e9: DO NOT MERGE Fix problem that reading/writing crypto footers wasn\'t identity
...
* commit '4efa3d2783d0061c62a02e550500ec6564d36553':
DO NOT MERGE Fix problem that reading/writing crypto footers wasn't identity
9 years ago
Paul Lawrence
4fade2334e
am ab5741de: (-s ours) am 2f32cda6: DO NOT MERGE Retry unmounts in ext4 encryption
...
* commit 'ab5741de494d7a5c8482b5c7ba7cbd1b7fd50bcf':
DO NOT MERGE Retry unmounts in ext4 encryption
9 years ago
Paul Lawrence
437939f56e
am 9cea1138: (-s ours) am b7f0702e: (-s ours) DO NOT MERGE Use default key permissions for ext4enc
...
* commit '9cea1138cf40bdbbb3ca93b0c82eaca360c7e3b5':
DO NOT MERGE Use default key permissions for ext4enc
DO NOT MERGE Simplify password checking logic
9 years ago
Paul Lawrence
74a28d5f6d
am 7344a7b5: (-s ours) am 368d7945: (-s ours) DO NOT MERGE Enable properties in ext4enc
...
* commit '7344a7b5afb4a2d4e1f131424a152deef7f49fc2':
DO NOT MERGE Enable properties in ext4enc
9 years ago
Paul Lawrence
b8b2cb4725
am b2292f0a: (-s ours) am c78c71b1: (-s ours) DO NOT MERGE Check password is correct by checking hash
...
* commit 'b2292f0a2c1ab74c39dd9dcab8ce4c208c9cb4f8':
DO NOT MERGE Check password is correct by checking hash
9 years ago
Paul Lawrence
4efa3d2783
am 0d9cd9e9: DO NOT MERGE Fix problem that reading/writing crypto footers wasn\'t identity
...
* commit '0d9cd9e9cf39e1cdb06565de6c4e11ff244b2a3a':
DO NOT MERGE Fix problem that reading/writing crypto footers wasn't identity
9 years ago
Paul Lawrence
ab5741de49
am 2f32cda6: DO NOT MERGE Retry unmounts in ext4 encryption
...
* commit '2f32cda63bf5c86db880d36029a27c8597fb5e3c':
DO NOT MERGE Retry unmounts in ext4 encryption
9 years ago
Paul Lawrence
9cea1138cf
am b7f0702e: (-s ours) DO NOT MERGE Use default key permissions for ext4enc
...
* commit 'b7f0702ea6cc32c58540d596016c2dabd8ba3541':
DO NOT MERGE Use default key permissions for ext4enc
DO NOT MERGE Simplify password checking logic
9 years ago
Paul Lawrence
8ca8962845
am 145fc84a: (-s ours) am fd7db732: (-s ours) DO NOT MERGE New ext4enc kernel switching from xattrs to ioctl
...
* commit '145fc84a79b1f6cb19240c492694f3e074202c12':
DO NOT MERGE New ext4enc kernel switching from xattrs to ioctl
9 years ago
Paul Lawrence
ba374a8793
am d4618a59: (-s ours) am 731a7a24: (-s ours) DO NOT MERGE Securely encrypt the master key
...
* commit 'd4618a59815dbd6c39fedd9a0f0774a0fb6248d1':
DO NOT MERGE Securely encrypt the master key
9 years ago
Paul Lawrence
7344a7b5af
am 368d7945: (-s ours) DO NOT MERGE Enable properties in ext4enc
...
* commit '368d79459e8d30474dd5cbc414623c1e2f78ee98':
DO NOT MERGE Enable properties in ext4enc
9 years ago
Paul Lawrence
b2292f0a2c
am c78c71b1: (-s ours) DO NOT MERGE Check password is correct by checking hash
...
* commit 'c78c71b1717613a5be921bbb8ac63c007d4af86a':
DO NOT MERGE Check password is correct by checking hash
9 years ago
Paul Lawrence
145fc84a79
am fd7db732: (-s ours) DO NOT MERGE New ext4enc kernel switching from xattrs to ioctl
...
* commit 'fd7db732434eb41fda69a353053bcb7aab259529':
DO NOT MERGE New ext4enc kernel switching from xattrs to ioctl
9 years ago
Paul Lawrence
d4618a5981
am 731a7a24: (-s ours) DO NOT MERGE Securely encrypt the master key
...
* commit '731a7a242df6cc3441ac82b4f9521546fac5ac2d':
DO NOT MERGE Securely encrypt the master key
9 years ago
Elliott Hughes
d25e107440
Merge "Don't use TEMP_FAILURE_RETRY on close in vold." into mnc-dev
9 years ago
Paul Lawrence
86c942a253
DO NOT MERGE Delete password as per block encryption
...
(cherry-picked from commit 00f4aade5c
)
Bug: 18151196
Change-Id: Iee0f932c61ff4a309dc2861725b24bf976adb4c7
9 years ago
Paul Lawrence
0d9cd9e9cf
DO NOT MERGE Fix problem that reading/writing crypto footers wasn't identity
...
(cherry-picked from commit 75c922f49b
)
Bug: 18151196
Change-Id: Ideef6bcdbccf068a64ed3e042be50c4837a373f8
9 years ago
Paul Lawrence
2f32cda63b
DO NOT MERGE Retry unmounts in ext4 encryption
...
(cherry-picked from commit 29b54aab8e
)
Bug: 18151196
Change-Id: I52ca23b2ce3adcff44bd003d4a12243a0bd6ac34
9 years ago
Paul Lawrence
b7f0702ea6
DO NOT MERGE Use default key permissions for ext4enc
...
(cherry-picked from commit 1190a26f6d
)
As per discussion default permissions are the correct ones.
Note that since we use logon keys, they cannot be read outside
the kernel.
Note also that we limit who can read/write keys in selinux policy.
Bug: 18151196
Change-Id: Icc916f430a70eff22e6b74c20ec361c8f3789c1c
9 years ago
Paul Lawrence
a56d3134b0
DO NOT MERGE Simplify password checking logic
...
(cherry-picked from commit aaccfac344
)
Bug: 18151196
Change-Id: I07ffde534dee7d1032149cfcbaa1a61c5246d759
9 years ago
Paul Lawrence
368d79459e
DO NOT MERGE Enable properties in ext4enc
...
(cherry-picked from 4e7274551c
)
Enables OwnerInfo and pattern suppression
Bug: 18151196
Change-Id: I46144e16cb00319deeb5492ab82c67f5dd43d6d3
9 years ago
Paul Lawrence
c78c71b171
DO NOT MERGE Check password is correct by checking hash
...
(cherry-picked from commit 3ca21e227a
)
Handle failures gracefully
Change-Id: Ifb6da8c11a86c50fb11964c18cc1be1326461f78
9 years ago
Paul Lawrence
fd7db73243
DO NOT MERGE New ext4enc kernel switching from xattrs to ioctl
...
(cherrypicked from commit 5e7f004231
)
This is one of three changes to enable this functionality:
https://android-review.googlesource.com/#/c/146259/
https://android-review.googlesource.com/#/c/146264/
https://android-review.googlesource.com/#/c/146265/
Bug: 18151196
Change-Id: Iba5146b8be1e15050ae901e08b3aaa26d96dcf7e
9 years ago
Paul Lawrence
731a7a242d
DO NOT MERGE Securely encrypt the master key
...
(cherry-picked from commit 707fd6c7cc
)
Move all key management into vold
Reuse vold's existing key management through the crypto footer
to manage the device wide keys.
Use ro.crypto.type flag to determine crypto type, which prevents
any issues when running in block encrypted mode, as well as speeding
up boot in block or no encryption.
This is one of four changes to enable this functionality:
https://android-review.googlesource.com/#/c/148586/
https://android-review.googlesource.com/#/c/148604/
https://android-review.googlesource.com/#/c/148606/
https://android-review.googlesource.com/#/c/148607/
Bug: 18151196
Change-Id: I3c68691717a61b5e1df76423ca0c02baff0dab98
9 years ago
Elliott Hughes
4e378be81e
Don't use TEMP_FAILURE_RETRY on close in vold.
...
Bug: http://b/20501816
Change-Id: Ia0a3899947582b8dd0e8e185c203d1ad7dad572e
9 years ago
Jeff Sharkey
a9ae06f092
am 65427f1a: Offer debug flag to force default primary.
...
* commit '65427f1a805ed2b8ee65a30ecf6ea8b14fe1e02b':
Offer debug flag to force default primary.
9 years ago
Jeff Sharkey
65427f1a80
Offer debug flag to force default primary.
...
Useful for transforming a secondary SD card slot into a primary SD
card slot without doing a completely different lunch target.
$ adb shell stop
$ adb shell setprop vold.debug.default_primary 1
$ adb shell setprop ro.vold.primary_physical 1
$ adb shell setprop ctl.restart vold
$ adb shell start
Bug: 21017105
Change-Id: I45aac7ab3bb4c5ac3e0140572844883823fc3e4f
9 years ago
Jeff Sharkey
6e9e89f787
am 721e5807: Fully sync filesystem before time measurements.
...
* commit '721e5807ed28c7630c0359212cdc0544a9918aa1':
Fully sync filesystem before time measurements.
9 years ago
Jeff Sharkey
721e5807ed
Fully sync filesystem before time measurements.
...
Also drop unneeded SCR register logging.
Bug: 21172095
Change-Id: I17c5aae2edc0eb7144ab38701f90a1fd54e119da
9 years ago
Elliott Hughes
817409c3d9
am 4351c9a0: Merge "Don\'t use TEMP_FAILURE_RETRY on close in vold." into mnc-dev
...
* commit '4351c9a08be1d95607e2e5d431692198d60b7d94':
Don't use TEMP_FAILURE_RETRY on close in vold.
9 years ago
Elliott Hughes
4351c9a08b
Merge "Don't use TEMP_FAILURE_RETRY on close in vold." into mnc-dev
9 years ago
Elliott Hughes
a623108ef4
Don't use TEMP_FAILURE_RETRY on close in vold.
...
Bug: http://b/20501816
Change-Id: Ieecce9304539c250ed1728252b8c2c09d29afd7f
9 years ago
Jeff Sharkey
ddd4da1af6
am 5a6bfca1: Initial pass at storage benchmarks.
...
* commit '5a6bfca1638760b87cf64c5ffb48ff3557cc0563':
Initial pass at storage benchmarks.
9 years ago
Jeff Sharkey
5a6bfca163
Initial pass at storage benchmarks.
...
Now that we're offering to store private app data on adopted storage
devices, the performance of those devices is much more important to
overall user experience.
To help set user expectations, this change offers to execute a
real-world benchmark on a storage device, returning a metric that can
be used to compare internal and external storage. The benchmark is
generated from the strace-instrumented storage access patterns of
typical apps.
A typical device completes the benchmark in under two seconds on
internal storage, a UHS-3 SD card is even faster (!), but a very slow
Class 4 SD card takes about 30 seconds to complete, giving us a clear
signal.
The measured benchmark numbers are logged along with information
about the storage device, such as manufacturer, model, etc. Card
serial numbers are scrubbed from output.
Bug: 21172095
Change-Id: I9b2713dafdfdfcf5d97bf1bc21841f39409a7e54
9 years ago
Jeff Sharkey
baf17b6acb
am e44a41a1: Communicate if we have adoptable disks.
...
* commit 'e44a41a17b5c2d488442d7805b08231f4b327aca':
Communicate if we have adoptable disks.
9 years ago
Jeff Sharkey
e44a41a17b
Communicate if we have adoptable disks.
...
Bug: 19993667
Change-Id: I3c3dddab157a11038f7160d24d53e728bde2194f
9 years ago
Jeff Sharkey
da7bc8a5f9
am 8d15cb98: Report internal path for public volumes.
...
* commit '8d15cb9828f89709243b33c610b429694788c05d':
Report internal path for public volumes.
9 years ago
Jeff Sharkey
8d15cb9828
Report internal path for public volumes.
...
Used by framework to bypass FUSE daemon overhead in some cases.
Bug: 21017105
Change-Id: I2f3ae70607417fc4cd2c970cb17cf3afa2f42613
9 years ago
Kenny Root
e05aacfec6
resolved conflicts for merge of 9df68a13
to mnc-dev-plus-aosp
...
Change-Id: I5c72c27ec055195d84c58d0699b46d3942c29dde
9 years ago
Paul Crowley
7239b92949
am eb0c05ce: Merge "Break key installation into its own function so we can install non-master keys."
...
* commit 'eb0c05ced4264f095b309b17f56babf49b3696dd':
Break key installation into its own function so we can install non-master keys.
9 years ago