82208b730f
[automerger skipped] Merge commit '635193ab36302e5f65e99c7df2f256cfd37068c7' into am-b7f1a67b-2024-4274-aa7d-e88e8cceb407 am: 9a35ab6a4f am: f707f1bb88 am: 2b9a343319 -s ours
...
am: 8e7c2624bb
6 years ago
8e7c2624bb
[automerger skipped] Merge commit '635193ab36302e5f65e99c7df2f256cfd37068c7' into am-b7f1a67b-2024-4274-aa7d-e88e8cceb407 am: 9a35ab6a4f am: f707f1bb88
...
am: 2b9a343319
6 years ago
2b9a343319
Merge commit '635193ab36302e5f65e99c7df2f256cfd37068c7' into am-b7f1a67b-2024-4274-aa7d-e88e8cceb407 am: 9a35ab6a4f
...
am: f707f1bb88
6 years ago
f707f1bb88
Merge commit '635193ab36302e5f65e99c7df2f256cfd37068c7' into am-b7f1a67b-2024-4274-aa7d-e88e8cceb407
...
am: 9a35ab6a4f
6 years ago
9a35ab6a4f
Merge commit '635193ab36302e5f65e99c7df2f256cfd37068c7' into am-b7f1a67b-2024-4274-aa7d-e88e8cceb407
...
* commit '635193ab36302e5f65e99c7df2f256cfd37068c7':
Require quotes when searching for blkid keys.
Bug: 80436257
Test: manual
Change-Id: I4cbae2d594edefa10e5e2c5236d17fe3d37818cd
6 years ago
635193ab36
[automerger] Require quotes when searching for blkid keys. am: ee5c7318d7 am: 98bb129cd3 am: 0c5a0d65c9 am: 7e51f8d0c4 am: 53fe89bbad am: 5716ee6d7a am: 4de0e883d0 am: a7946bf9c6
...
Change-Id: I831bc503b1fdcf5a6a0c31ac0ded46d301c410ef
6 years ago
a7946bf9c6
[automerger] Require quotes when searching for blkid keys. am: ee5c7318d7 am: 98bb129cd3 am: 0c5a0d65c9 am: 7e51f8d0c4 am: 53fe89bbad am: 5716ee6d7a am: 4de0e883d0
...
Change-Id: I66ce047987d59d1344cd46e14e07ae0d3cb4bf9a
6 years ago
4de0e883d0
[automerger] Require quotes when searching for blkid keys. am: ee5c7318d7 am: 98bb129cd3 am: 0c5a0d65c9 am: 7e51f8d0c4 am: 53fe89bbad am: 5716ee6d7a
...
Change-Id: Icf5c0c0a0c4f4aec605182111dcedf16f5a4ab95
6 years ago
5716ee6d7a
[automerger] Require quotes when searching for blkid keys. am: ee5c7318d7 am: 98bb129cd3 am: 0c5a0d65c9 am: 7e51f8d0c4 am: 53fe89bbad
...
Change-Id: I87042d7d1d7b2cf9baeb3f28fd9ab31e5f97f62a
6 years ago
53fe89bbad
[automerger] Require quotes when searching for blkid keys. am: ee5c7318d7 am: 98bb129cd3 am: 0c5a0d65c9 am: 7e51f8d0c4
...
Change-Id: I5f21e49be9c536e51dbaadde0bd53545dc8cbaae
6 years ago
7e51f8d0c4
[automerger] Require quotes when searching for blkid keys. am: ee5c7318d7 am: 98bb129cd3 am: 0c5a0d65c9
...
Change-Id: I585336447c06e09b499ad2656b731105f1ebc4c4
6 years ago
0c5a0d65c9
[automerger] Require quotes when searching for blkid keys. am: ee5c7318d7 am: 98bb129cd3
...
Change-Id: I91516dfd0a046aa2763df3c09ef6e8570d7f1b55
6 years ago
98bb129cd3
[automerger] Require quotes when searching for blkid keys. am: ee5c7318d7
...
Change-Id: If8422cf170db4e05dbe4cf6c1ed4ebf8126b0c71
6 years ago
ee5c7318d7
Require quotes when searching for blkid keys.
...
In combination with a blkid change, this prevents the parsing logic
from getting confused by key names appearing inside values. (The
blkid change suppresses any quotes that appear inside values.)
Bug: 80436257
Test: manual
Change-Id: I9480ef6eb78254b812c671950875d0b8918a27c6
6 years ago
72fb1a6d6c
Fix double close in GetTreeBytes.
...
calculate_dir_size closes the fd that it receives.
Bug: http://b/80446935
Test: treehugger
Change-Id: I56a428cd7eb78e56c55434628c1c7b2b87637c81
6 years ago
cb62773a99
Explain the rationale for not using StrongBox in vold.
...
am: e763ed2aa3
6 years ago
e763ed2aa3
Explain the rationale for not using StrongBox in vold.
...
Bug: 77338527
Test: Comment-only change.
Change-Id: I9f87e34854eabcc4c183553cf56a033970bb867e
6 years ago
694140bf71
Add rc file for wait_for_keymaster
...
am: f5b085c13a
6 years ago
f5b085c13a
Add rc file for wait_for_keymaster
...
Similar to update_verifier, define higher prio and use exec_start for
this binary.
Bug: 79492334
Test: Reboot test
Change-Id: I8d3133cabcc8d4cee8bdead310f2c18d8d07e9dd
6 years ago
d6502365c7
Merge "vold: Add nvme disk support" am: 6054bc3ded
...
am: 3a920e3f6e
6 years ago
3a920e3f6e
Merge "vold: Add nvme disk support"
...
am: 6054bc3ded
6 years ago
6054bc3ded
Merge "vold: Add nvme disk support"
6 years ago
06dc6e512b
vold: Add nvme disk support
...
Bug: 77482940
Test: Manual
Change-Id: Id0e7b3a0aa2083276109b0b2c9d1bcb81852582f
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
6 years ago
9bc120416b
Merge "Do Keymaster HMAC key agreement in vold." into pi-dev
...
am: a229dac0e7
6 years ago
a229dac0e7
Merge "Do Keymaster HMAC key agreement in vold." into pi-dev
6 years ago
ee4aa096d9
Fix spurious error
...
am: 98a23a19d1
6 years ago
98a23a19d1
Fix spurious error
...
Bug: 79542247
Test: error no longer appears
Change-Id: I2cf91c8cd937b81041a47e4b64a882445a80eb0b
6 years ago
07b28ebecd
add wait_for_keymaster
...
am: 8f82879901
6 years ago
2807536fc4
Do Keymaster HMAC key agreement in vold.
...
Bug: 79307225
Test: Boot
Change-Id: I6682e86076aa568907d94024ef175dbdede86557
6 years ago
8f82879901
add wait_for_keymaster
...
Bug: 79228237
Test: boots with patch
Change-Id: I581bcd4c4dd92c5b7be70eb351ecba20225e1eee
6 years ago
ba2861c225
[automerger skipped] Merge changes I3c14cfcf,I9d2ea66c,I9930105e am: 14540d9ceb
...
am: b053bc0716
6 years ago
b053bc0716
Merge changes I3c14cfcf,I9d2ea66c,I9930105e
...
am: 14540d9ceb
6 years ago
14540d9ceb
Merge changes I3c14cfcf,I9d2ea66c,I9930105e
...
* changes:
Replace library headers with angle quotations
Reorder the include directives in cryptfs.cpp
Add linux/types.h to cryptfs.h
6 years ago
196d5850f2
Replace library headers with angle quotations
...
This commit replaces the double quotations for library headers with
angle quotations.
Test: cd system/vold && mma
Change-Id: I3c14cfcf80f29173669409df548af84c1b39b96d
Merged-In: I3c14cfcf80f29173669409df548af84c1b39b96d
6 years ago
862eef7ace
Reorder the include directives in cryptfs.cpp
...
This commit reorders the include directives in cryptfs.cpp so that
upcoming <cutils/log.h> change can be obvious.
Test: lunch aosp_walleye-userdebug && cd system/vold && mma
Change-Id: I9d2ea66c15b7b68014a67ba7c1420075953459ba
Merged-In: I9d2ea66c15b7b68014a67ba7c1420075953459ba
6 years ago
83a5ad2731
Add linux/types.h to cryptfs.h
...
This commit adds <linux/types.h> to cryptfs.h because cryptfs.h uses
`__le16` and `__le32` which are defined in <linux/types.h>.
The absence of <linux/types.h> will become an error after we sort the
headers in the upcoming commits.
Test: cd system/vold && mma
Change-Id: I9930105ee86f80a29295b59596b21335c68a8e23
Merged-In: I9930105ee86f80a29295b59596b21335c68a8e23
6 years ago
188b0ab7b3
Deprecate <cutils/log.h> and <utils/Log.h>
...
This commit replaces <cutils/log.h> and <utils/Log.h> with <log/log.h>.
Background:
<cutils/log.h> has been moved to <log/log.h> for a while. Both
<cutils/log.h> and <utils/Log.h> simply includes <log/log.h> for
backward compatibility. This commit is a part of the effort to remove
<cutils/log.h> and <utils/Log.h> from the source tree eventually.
Bug: 78370064
Test: lunch aosp_walleye-userdebug && cd system/vold && mma
Change-Id: I1f9b7b132f9c35469e97556a30b521cc47e829d7
6 years ago
3f2b122cd2
Replace library headers with angle quotations
...
This commit replaces the double quotations for library headers with
angle quotations.
Test: cd system/vold && mma
Change-Id: I3c14cfcf80f29173669409df548af84c1b39b96d
6 years ago
d557d76466
Reorder the include directives in cryptfs.cpp
...
This commit reorders the include directives in cryptfs.cpp so that
upcoming <cutils/log.h> change can be obvious.
Test: lunch aosp_walleye-userdebug && cd system/vold && mma
Change-Id: I9d2ea66c15b7b68014a67ba7c1420075953459ba
6 years ago
0267ccf8a4
Add linux/types.h to cryptfs.h
...
This commit adds <linux/types.h> to cryptfs.h because cryptfs.h uses
`__le16` and `__le32` which are defined in <linux/types.h>.
The absence of <linux/types.h> will become an error after we sort the
headers in the upcoming commits.
Test: cd system/vold && mma
Change-Id: I9930105ee86f80a29295b59596b21335c68a8e23
6 years ago
53411c7cad
Merge "vold: Idle-maint calls device GC" into pi-dev
...
am: 4a04cad4ec
6 years ago
4a04cad4ec
Merge "vold: Idle-maint calls device GC" into pi-dev
6 years ago
8337899103
Merge "Exclude /mnt/vendor from vold's ownership." into pi-dev
...
am: b244714eea
6 years ago
b244714eea
Merge "Exclude /mnt/vendor from vold's ownership." into pi-dev
6 years ago
bca5cd78fe
Exclude /mnt/vendor from vold's ownership.
...
Addresses this selinux denial:
avc: denied { search } for name="vendor" dev="tmpfs" ino=11069
scontext=u:r:vold:s0 tcontext=u:object_r:mnt_vendor_file:s0 tclass=dir
permissive=0
Bug: 64905218
Test: fixes above denial.
Change-Id: I670b2148e65c7e0fcabd1e11f5bace0c4f4e18bd
6 years ago
eefc5eebc3
vold: Idle-maint calls device GC
...
This activates device GCs in idle time.
F2FS GC = 7 mins
Trim = 1 mins
Dev GC = 2 mins
Bug: 63264275
Bug: 68721792
Change-Id: I843a742ef192ebe00d77c47a216d4200bc9ccb9d
Signed-off-by: Jaegeuk Kim <jaegeuk@google.com>
6 years ago
4e3a51ff18
vold: set f2fs feature bit
...
am: 7db02ab5d1
6 years ago
7db02ab5d1
vold: set f2fs feature bit
...
Bug: 74604441
Bug: 67380979
Change-Id: Ifcb43fb4f8fbdf79e70cfa208af73073d815e254
Signed-off-by: Jaegeuk Kim <jaegeuk@google.com>
6 years ago
eea3792845
Merge "Remove waitpid on UnMount" am: f6dbba8846
...
am: 1584dc0d1d
6 years ago
1584dc0d1d
Merge "Remove waitpid on UnMount"
...
am: f6dbba8846
6 years ago
Jeff Sharkey
Android Build Merger (Role)
Josh Gao
Shawn Willden
Wei Wang
Dmitry Shmidt
Treehugger Robot
Paul Crowley
Logan Chien
Jaegeuk Kim
Tri Vo
Daniel Rosenberg