Treehugger Robot
9b18b764bc
Merge "Use std::move() to prevent unnecessary copying. [DO NOT MERGE]"
6 years ago
Stephen Hines
84eaf2f3b6
Use std::move() to prevent unnecessary copying. [DO NOT MERGE]
...
Bug: http://b/110779387
Test: Builds with new toolchain.
Change-Id: I735a3ecda11a662edaddbe21c36433a91bb8a7f1
6 years ago
Bowgo Tsai
1c1186618b
Merge "Do not unmount /mnt/product/* when vold starts" am: 4a625453bf
...
am: 3d4fb41f3d
Change-Id: I264a9ed62e8c1884e928fe17edd35cf99a382129
6 years ago
Bowgo Tsai
3d4fb41f3d
Merge "Do not unmount /mnt/product/* when vold starts"
...
am: 4a625453bf
Change-Id: Idd91865540106b5030f74b26037b61c00719ef28
6 years ago
Treehugger Robot
4a625453bf
Merge "Do not unmount /mnt/product/* when vold starts"
6 years ago
Tri Vo
4cc6e5c08b
[automerger skipped] Merge "Exclude /mnt/vendor from vold's ownership." am: 4a634e3d8c
-s ours
...
am: 8d4da29312
-s ours
Change-Id: Ifa9dceb3573d14683922a84ebe8021adb6ffd12e
6 years ago
Tri Vo
8d4da29312
[automerger skipped] Merge "Exclude /mnt/vendor from vold's ownership."
...
am: 4a634e3d8c
-s ours
Change-Id: I71402c01429c1cd6c16e10398a7d3c0853fb19a4
6 years ago
Treehugger Robot
4a634e3d8c
Merge "Exclude /mnt/vendor from vold's ownership."
6 years ago
Bowgo Tsai
c0cd37be9d
Do not unmount /mnt/product/* when vold starts
...
Bug: 110808288
Test: Boot a device and checks /mnt/product/foo mounted in early mount
isn't unmounted.
Change-Id: Ide411cd78565505bc72ed57e79f3d31b6392b27c
6 years ago
Tri Vo
e98adee732
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
Merged-In: I670b2148e65c7e0fcabd1e11f5bace0c4f4e18bd
(cherry picked from commit bca5cd78fe
)
6 years ago
Logan Chien
fbce8d9426
[automerger skipped] Merge changes I1f9b7b13,I36bc4a44 am: 17a93d5001
-s ours
...
am: cc99436c66
-s ours
Change-Id: Icce3dc07b1efda15a0d48ecf78da002102f87bdc
6 years ago
Logan Chien
cc99436c66
[automerger skipped] Merge changes I1f9b7b13,I36bc4a44
...
am: 17a93d5001
-s ours
Change-Id: I94cd57d89e0c2091e7b9c645103b736e1e0e789a
6 years ago
Logan Chien
17a93d5001
Merge changes I1f9b7b13,I36bc4a44
...
* changes:
Deprecate <cutils/log.h> and <utils/Log.h>
Replace SLOG() with LOG(ERROR)
6 years ago
Logan Chien
7e0af8e480
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
Merged-In: I1f9b7b132f9c35469e97556a30b521cc47e829d7
6 years ago
Logan Chien
bf319c4e70
Replace SLOG() with LOG(ERROR)
...
This commit replaces SLOG() from cutils/log.h with LOG(ERROR) from
android-base/logging.h.
This commit is a partial cherry-pick of
3472e52fc2
.
Test: mma # it builds
Change-Id: I36bc4a4430fc16b2c1c2eb39a2ec4d888c1ae352
Merged-In: I70dc512f21459d1e25b187f24289002b2c7bc7af
6 years ago
Jeff Sharkey
fe8274f921
Merge "Rely on updated newfs_msdos for parameter tuning." am: 7d557e98be
...
am: c1e10dc348
Change-Id: Ic43dd314add68268a55a04352570115631366353
6 years ago
Jeff Sharkey
c1e10dc348
Merge "Rely on updated newfs_msdos for parameter tuning."
...
am: 7d557e98be
Change-Id: I20d1a2c9dd402aa85d61c4cf3d765c487ca697f9
6 years ago
Treehugger Robot
7d557e98be
Merge "Rely on updated newfs_msdos for parameter tuning."
6 years ago
Jeff Sharkey
a76f149f12
Rely on updated newfs_msdos for parameter tuning.
...
The recently updated newfs_msdos tool has robust tuning logic
internally to pick balanced values for parameters like sectors-per-
cluster, so rely on it instead of trying to force invalid
configurations.
If stakeholders want to tune these parameters even further, they
should contribute to upstream newfs_msdos, where it will benefit
more than just Android devices.
Bug: 29899852
Test: manual with 512MB, 2GB and 34GB devices
Change-Id: I23ab3699f37fc428c2bd7dcbd84f825412d916e6
6 years ago
Josh Gao
26f604eb5a
Merge "Fix double close in GetTreeBytes." am: 142702dc82
...
am: 45175c437f
Change-Id: Ie6c89c98d504b91e26987275db365849448b1dc2
6 years ago
Xin Li
25f2262db7
Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master
...
am: 12e0362fd8
Change-Id: I0f4e22435cd6b2f9beca188011cd3cdffab55671
6 years ago
Josh Gao
45175c437f
Merge "Fix double close in GetTreeBytes."
...
am: 142702dc82
Change-Id: I1c9f259d4d372ef1a3c36a9f884e39b8003f7ff0
6 years ago
Treehugger Robot
142702dc82
Merge "Fix double close in GetTreeBytes."
6 years ago
Xin Li
12e0362fd8
Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master
...
Bug: 79597307
Change-Id: I98ee147a69f0cd3bbcf9fc89acfdc467c91d2b8c
6 years ago
Luis Hector Chavez
cf5c9907f5
resolve merge conflicts of 7bf98aa8a0
to pi-dev-plus-aosp
...
BUG: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I08252155f04e8b414f2149d8b29e5e2fff6bcc82
6 years ago
Luis Hector Chavez
7bf98aa8a0
Merge "vold: Avoid SIGSEGVs when fstab lacks /data"
...
am: e3017e0b18
Change-Id: Ib426ece8c295f58750de2526e9ca91c24791b731
6 years ago
Treehugger Robot
e3017e0b18
Merge "vold: Avoid SIGSEGVs when fstab lacks /data"
6 years ago
Luis Hector Chavez
bbb512d019
vold: Avoid SIGSEGVs when fstab lacks /data
...
This change adds null-checks for all the places where cryptfs tries to
access the /data entry in fstab, to avoid crashes.
Bug: 80493321
Test: No crashes in Android-in-Chrome OS (which lacks /data in fstab)
Change-Id: Id6cdfe01cdd336cebf8afb9bdd07135811115182
Merged-In: Id6cdfe01cdd336cebf8afb9bdd07135811115182
6 years ago
android-build-team Robot
5dce8b6609
Snap for 4818534 from 8e7c2624bb
to pi-release
...
Change-Id: Ide5bb29ab8692ee78e214908f62096c3e113af5f
6 years ago
Jeff Sharkey
82208b730f
[automerger skipped] Merge commit '635193ab36302e5f65e99c7df2f256cfd37068c7' into am-b7f1a67b-2024-4274-aa7d-e88e8cceb407 am: 9a35ab6a4f
am: f707f1bb88
am: 2b9a343319
-s ours
...
am: 8e7c2624bb
Change-Id: Id3d4b780bab0e36da7d6bb3abf932c947a8fad86
6 years ago
Jeff Sharkey
8e7c2624bb
[automerger skipped] Merge commit '635193ab36302e5f65e99c7df2f256cfd37068c7' into am-b7f1a67b-2024-4274-aa7d-e88e8cceb407 am: 9a35ab6a4f
am: f707f1bb88
...
am: 2b9a343319
-s ours
Change-Id: Ibdcc6722750cfe7cb394a52d21de8e73ecdfd650
6 years ago
Jeff Sharkey
2b9a343319
Merge commit '635193ab36302e5f65e99c7df2f256cfd37068c7' into am-b7f1a67b-2024-4274-aa7d-e88e8cceb407 am: 9a35ab6a4f
...
am: f707f1bb88
Change-Id: I4d9e269f34cab043a7c437781187d9a47e0fa652
6 years ago
Jeff Sharkey
f707f1bb88
Merge commit '635193ab36302e5f65e99c7df2f256cfd37068c7' into am-b7f1a67b-2024-4274-aa7d-e88e8cceb407
...
am: 9a35ab6a4f
Change-Id: I273dc86e0b0580bef81e272a94043b269d7df402
6 years ago
Jeff Sharkey
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
Android Build Merger (Role)
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
Android Build Merger (Role)
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
Android Build Merger (Role)
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
Android Build Merger (Role)
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
Android Build Merger (Role)
53fe89bbad
[automerger] Require quotes when searching for blkid keys. am: ee5c7318d7
am: 98bb129cd3
am: 0c5a0d65c9
am: 7e51f8d0c4
...
Change-Id: I5f21e49be9c536e51dbaadde0bd53545dc8cbaae
6 years ago
Android Build Merger (Role)
7e51f8d0c4
[automerger] Require quotes when searching for blkid keys. am: ee5c7318d7
am: 98bb129cd3
am: 0c5a0d65c9
...
Change-Id: I585336447c06e09b499ad2656b731105f1ebc4c4
6 years ago
Android Build Merger (Role)
0c5a0d65c9
[automerger] Require quotes when searching for blkid keys. am: ee5c7318d7
am: 98bb129cd3
...
Change-Id: I91516dfd0a046aa2763df3c09ef6e8570d7f1b55
6 years ago
Android Build Merger (Role)
98bb129cd3
[automerger] Require quotes when searching for blkid keys. am: ee5c7318d7
...
Change-Id: If8422cf170db4e05dbe4cf6c1ed4ebf8126b0c71
6 years ago
Jeff Sharkey
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
Josh Gao
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
android-build-team Robot
714a665e4d
Snap for 4793185 from e763ed2aa3
to pi-release
...
Change-Id: If756e11bbaf9d526a472fbbdf309520c3ef9695f
6 years ago
Shawn Willden
cb62773a99
Explain the rationale for not using StrongBox in vold.
...
am: e763ed2aa3
Change-Id: I38d70389cec085fa44760ebe8bb0bd264b475e69
6 years ago
Shawn Willden
e763ed2aa3
Explain the rationale for not using StrongBox in vold.
...
Bug: 77338527
Test: Comment-only change.
Change-Id: I9f87e34854eabcc4c183553cf56a033970bb867e
6 years ago
Wei Wang
694140bf71
Add rc file for wait_for_keymaster
...
am: f5b085c13a
Change-Id: I67ed38f476466a284cf6090929d5c7ac8016b7e0
6 years ago
Wei Wang
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
Dmitry Shmidt
d6502365c7
Merge "vold: Add nvme disk support" am: 6054bc3ded
...
am: 3a920e3f6e
Change-Id: Ie4946e65924fffae8b810b54658b64e34a543fb4
6 years ago