Logan Chien
17a93d5001
Merge changes I1f9b7b13,I36bc4a44
...
* changes:
Deprecate <cutils/log.h> and <utils/Log.h>
Replace SLOG() with LOG(ERROR)
2018-06-26 02:04:17 +00:00
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
2018-06-25 10:29:33 +08:00
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
2018-06-25 10:29:30 +08:00
Jeff Sharkey
fe8274f921
Merge "Rely on updated newfs_msdos for parameter tuning." am: 7d557e98be
...
am: c1e10dc348
2018-06-19 16:38:24 -07:00
Jeff Sharkey
c1e10dc348
Merge "Rely on updated newfs_msdos for parameter tuning."
...
am: 7d557e98be
2018-06-19 16:34:37 -07:00
Treehugger Robot
7d557e98be
Merge "Rely on updated newfs_msdos for parameter tuning."
2018-06-19 23:26:05 +00:00
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
2018-06-19 15:35:05 -06:00
Josh Gao
26f604eb5a
Merge "Fix double close in GetTreeBytes." am: 142702dc82
...
am: 45175c437f
2018-06-09 09:11:57 -07:00
Xin Li
25f2262db7
Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master
...
am: 12e0362fd8
2018-06-09 04:11:26 -07:00
Josh Gao
45175c437f
Merge "Fix double close in GetTreeBytes."
...
am: 142702dc82
2018-06-08 17:17:56 -07:00
Treehugger Robot
142702dc82
Merge "Fix double close in GetTreeBytes."
2018-06-08 23:34:41 +00:00
Xin Li
12e0362fd8
Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master
...
Bug: 79597307
Change-Id: I98ee147a69f0cd3bbcf9fc89acfdc467c91d2b8c
2018-06-08 11:09:27 -07:00
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
2018-06-05 10:10:08 -07:00
Luis Hector Chavez
7bf98aa8a0
Merge "vold: Avoid SIGSEGVs when fstab lacks /data"
...
am: e3017e0b18
2018-06-04 16:22:48 -07:00
Treehugger Robot
e3017e0b18
Merge "vold: Avoid SIGSEGVs when fstab lacks /data"
2018-06-04 20:49:41 +00:00
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
2018-06-04 19:12:17 +00:00
android-build-team Robot
5dce8b6609
Snap for 4818534 from 8e7c2624bb to pi-release
...
Change-Id: Ide5bb29ab8692ee78e214908f62096c3e113af5f
2018-06-03 07:21:49 +00:00
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
2018-06-01 16:03:58 -07:00
Jeff Sharkey
8e7c2624bb
[automerger skipped] Merge commit '635193ab36302e5f65e99c7df2f256cfd37068c7' into am-b7f1a67b-2024-4274-aa7d-e88e8cceb407 am: 9a35ab6a4f am: f707f1bb88
...
am: 2b9a343319
2018-06-01 15:57:36 -07:00
Jeff Sharkey
2b9a343319
Merge commit '635193ab36302e5f65e99c7df2f256cfd37068c7' into am-b7f1a67b-2024-4274-aa7d-e88e8cceb407 am: 9a35ab6a4f
...
am: f707f1bb88
2018-06-01 15:31:32 -07:00
Jeff Sharkey
f707f1bb88
Merge commit '635193ab36302e5f65e99c7df2f256cfd37068c7' into am-b7f1a67b-2024-4274-aa7d-e88e8cceb407
...
am: 9a35ab6a4f
2018-06-01 15:19:33 -07:00
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
2018-06-01 16:03:06 -06:00
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
2018-06-01 21:46:12 +00:00
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
2018-06-01 21:46:11 +00:00
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
2018-06-01 21:46:09 +00:00
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
2018-06-01 21:46:08 +00:00
Android Build Merger (Role)
53fe89bbad
[automerger] Require quotes when searching for blkid keys. am: ee5c7318d7 am: 98bb129cd3 am: 0c5a0d65c9 am: 7e51f8d0c4
...
Change-Id: I5f21e49be9c536e51dbaadde0bd53545dc8cbaae
2018-06-01 21:46:06 +00:00
Android Build Merger (Role)
7e51f8d0c4
[automerger] Require quotes when searching for blkid keys. am: ee5c7318d7 am: 98bb129cd3 am: 0c5a0d65c9
...
Change-Id: I585336447c06e09b499ad2656b731105f1ebc4c4
2018-06-01 21:46:05 +00:00
Android Build Merger (Role)
0c5a0d65c9
[automerger] Require quotes when searching for blkid keys. am: ee5c7318d7 am: 98bb129cd3
...
Change-Id: I91516dfd0a046aa2763df3c09ef6e8570d7f1b55
2018-06-01 21:46:04 +00:00
Android Build Merger (Role)
98bb129cd3
[automerger] Require quotes when searching for blkid keys. am: ee5c7318d7
...
Change-Id: If8422cf170db4e05dbe4cf6c1ed4ebf8126b0c71
2018-06-01 21:46:02 +00:00
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
2018-06-01 21:12:54 +00:00
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
2018-05-30 11:13:42 -07:00
android-build-team Robot
714a665e4d
Snap for 4793185 from e763ed2aa3 to pi-release
...
Change-Id: If756e11bbaf9d526a472fbbdf309520c3ef9695f
2018-05-20 07:22:58 +00:00
Shawn Willden
cb62773a99
Explain the rationale for not using StrongBox in vold.
...
am: e763ed2aa3
2018-05-17 15:36:25 -07:00
Shawn Willden
e763ed2aa3
Explain the rationale for not using StrongBox in vold.
...
Bug: 77338527
Test: Comment-only change.
Change-Id: I9f87e34854eabcc4c183553cf56a033970bb867e
2018-05-17 15:24:56 -06:00
Wei Wang
694140bf71
Add rc file for wait_for_keymaster
...
am: f5b085c13a
2018-05-17 11:50:46 -07:00
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
2018-05-15 16:15:21 -07:00
Dmitry Shmidt
d6502365c7
Merge "vold: Add nvme disk support" am: 6054bc3ded
...
am: 3a920e3f6e
2018-05-15 13:35:52 -07:00
Dmitry Shmidt
3a920e3f6e
Merge "vold: Add nvme disk support"
...
am: 6054bc3ded
2018-05-15 13:25:50 -07:00
Treehugger Robot
6054bc3ded
Merge "vold: Add nvme disk support"
2018-05-15 19:33:57 +00:00
Dmitry Shmidt
06dc6e512b
vold: Add nvme disk support
...
Bug: 77482940
Test: Manual
Change-Id: Id0e7b3a0aa2083276109b0b2c9d1bcb81852582f
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2018-05-15 10:44:52 -07:00
android-build-team Robot
95f87153b9
Snap for 4778776 from a229dac0e7 to pi-release
...
Change-Id: I343a17b8d7a69aace12031bc26c3888b21ae8356
2018-05-13 07:25:09 +00:00
Shawn Willden
9bc120416b
Merge "Do Keymaster HMAC key agreement in vold." into pi-dev
...
am: a229dac0e7
2018-05-11 09:45:32 -07:00
TreeHugger Robot
a229dac0e7
Merge "Do Keymaster HMAC key agreement in vold." into pi-dev
2018-05-11 16:38:40 +00:00
Paul Crowley
ee4aa096d9
Fix spurious error
...
am: 98a23a19d1
2018-05-10 17:12:05 -07:00
Paul Crowley
98a23a19d1
Fix spurious error
...
Bug: 79542247
Test: error no longer appears
Change-Id: I2cf91c8cd937b81041a47e4b64a882445a80eb0b
2018-05-10 15:19:15 -07:00
android-build-team Robot
71b3133394
Merge cherrypicks of [4036940, 4036941, 4036942, 4037115, 4037135] into pi-release
...
Change-Id: I78d051f65b582f6ca8e5a9eb565a1c2d7d4a6705
2018-05-10 14:53:46 +00:00
Paul Crowley
31c4c00860
add wait_for_keymaster
...
Bug: 79228237
Test: boots with patch
Change-Id: I581bcd4c4dd92c5b7be70eb351ecba20225e1eee
(cherry picked from commit 8f82879901
2018-05-10 14:53:40 +00:00
Paul Crowley
07b28ebecd
add wait_for_keymaster
...
am: 8f82879901
2018-05-09 23:55:46 -07:00
Shawn Willden
2807536fc4
Do Keymaster HMAC key agreement in vold.
...
Bug: 79307225
Test: Boot
Change-Id: I6682e86076aa568907d94024ef175dbdede86557
2018-05-09 15:14:34 -06:00
