Jaegeuk Kim
ca772bf314
vold: meta encryption: fix /dev/block/by-name/userdata to dm-3 am: 31e962fe19
...
am: fe69ce34e6
2018-07-30 13:26:53 -07:00
Jaegeuk Kim
fe69ce34e6
vold: meta encryption: fix /dev/block/by-name/userdata to dm-3
...
am: 31e962fe19
2018-07-30 13:22:02 -07:00
Jaegeuk Kim
31e962fe19
vold: meta encryption: fix /dev/block/by-name/userdata to dm-3
...
This fixes F2FS GC failure in idle-maint.
07-28 18:25:54.838 603 11187 D vold : idle maintenance started
07-28 18:25:54.846 603 11187 D vold : Start GC on /sys/fs/f2fs/sda21
07-28 18:25:54.847 603 11187 W vold : Set discard gralunarity failed on/sys/fs/f2fs/sda21: No such file or directory
07-28 18:25:54.847 603 11187 W vold : Start GC failed on /sys/fs/f2fs/sda21: No such file or directory
Bug: 111953875
Change-Id: I1d10802121d5641cf9ba780fee249affd2cf6ffe
Signed-off-by: Jaegeuk Kim <jaegeuk@google.com>
2018-07-29 18:22:47 -07:00
Roman Kiryanov
f101236657
Do not crash if secontext is nullptr
...
LOG(DEBUG) tries to print a string pointed by secontext.get() but
crashed if it was nullptr.
Bug: 111888637
Test: "make -j50" and ran emulator
Change-Id: Iac78f650e7f48781030dc610f7d35cd52c250802
Signed-off-by: Roman Kiryanov <rkir@google.com>
2018-07-26 13:41:14 -07:00
Stephen Hines
ad30540eb6
[automerger skipped] Merge "Use std::move() to prevent unnecessary copying. [DO NOT MERGE]" am: 9b18b764bc -s ours am: 2abec98856 -s ours am: dae4988a56 -s ours
...
am: 0aff51eb28
2018-07-24 20:36:57 -07:00
Stephen Hines
0aff51eb28
[automerger skipped] Merge "Use std::move() to prevent unnecessary copying. [DO NOT MERGE]" am: 9b18b764bc -s ours am: 2abec98856 -s ours
...
am: dae4988a56
2018-07-24 20:31:59 -07:00
Stephen Hines
dae4988a56
[automerger skipped] Merge "Use std::move() to prevent unnecessary copying. [DO NOT MERGE]" am: 9b18b764bc -s ours
...
am: 2abec98856
2018-07-24 20:27:59 -07:00
Stephen Hines
2abec98856
[automerger skipped] Merge "Use std::move() to prevent unnecessary copying. [DO NOT MERGE]"
...
am: 9b18b764bc
2018-07-24 20:25:09 -07:00
Treehugger Robot
9b18b764bc
Merge "Use std::move() to prevent unnecessary copying. [DO NOT MERGE]"
2018-07-25 03:15:21 +00:00
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
2018-07-24 18:22:36 -07:00
Bowgo Tsai
121daf93c5
Merge "Do not unmount /mnt/product/* when vold starts" am: 4a625453bf am: 3d4fb41f3d
...
am: 1c1186618b
2018-07-02 19:10:56 -07:00
Bowgo Tsai
1c1186618b
Merge "Do not unmount /mnt/product/* when vold starts" am: 4a625453bf
...
am: 3d4fb41f3d
2018-07-02 19:07:37 -07:00
Bowgo Tsai
3d4fb41f3d
Merge "Do not unmount /mnt/product/* when vold starts"
...
am: 4a625453bf
2018-07-02 19:03:58 -07:00
Treehugger Robot
4a625453bf
Merge "Do not unmount /mnt/product/* when vold starts"
2018-07-03 00:21:01 +00:00
Tri Vo
0a0016ddc9
[automerger skipped] Merge "Exclude /mnt/vendor from vold's ownership." am: 4a634e3d8c -s ours am: 8d4da29312 -s ours
...
am: 4cc6e5c08b
2018-06-29 10:04:34 -07:00
Tri Vo
4cc6e5c08b
[automerger skipped] Merge "Exclude /mnt/vendor from vold's ownership." am: 4a634e3d8c -s ours
...
am: 8d4da29312
2018-06-29 10:00:34 -07:00
Tri Vo
8d4da29312
[automerger skipped] Merge "Exclude /mnt/vendor from vold's ownership."
...
am: 4a634e3d8c
2018-06-29 09:57:13 -07:00
Treehugger Robot
4a634e3d8c
Merge "Exclude /mnt/vendor from vold's ownership."
2018-06-29 16:47:11 +00:00
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
2018-06-29 13:35:43 +08:00
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
2018-06-29 12:22:01 +08:00
Logan Chien
1638418fc3
[automerger skipped] Merge changes I1f9b7b13,I36bc4a44 am: 17a93d5001 -s ours am: cc99436c66 -s ours
...
am: fbce8d9426
2018-06-25 19:16:02 -07:00
Logan Chien
fbce8d9426
[automerger skipped] Merge changes I1f9b7b13,I36bc4a44 am: 17a93d5001 -s ours
...
am: cc99436c66
2018-06-25 19:12:55 -07:00
Logan Chien
cc99436c66
[automerger skipped] Merge changes I1f9b7b13,I36bc4a44
...
am: 17a93d5001
2018-06-25 19:09:39 -07:00
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
fa84b4e7e0
Merge "Rely on updated newfs_msdos for parameter tuning." am: 7d557e98be am: c1e10dc348
...
am: fe8274f921
2018-06-19 16:48:49 -07: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
541b23f1d4
Merge "Fix double close in GetTreeBytes." am: 142702dc82 am: 45175c437f
...
am: 26f604eb5a
2018-06-09 09:22:35 -07:00
Josh Gao
26f604eb5a
Merge "Fix double close in GetTreeBytes." am: 142702dc82
...
am: 45175c437f
2018-06-09 09:11:57 -07:00
Xin Li
3a1d2a0ba5
Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master am: 12e0362fd8
...
am: 25f2262db7
2018-06-09 07:37:48 -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
6ace837b7e
resolve merge conflicts of 7bf98aa8a0 to pi-dev-plus-aosp
...
am: cf5c9907f5
2018-06-05 11:28:58 -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
TreeHugger Robot
943eb661ec
Merge "vold: Avoid SIGSEGVs when fstab lacks /data"
2018-06-04 16:03:30 +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
2d09c320f0
[automerger skipped] Merge commit '635193ab36302e5f65e99c7df2f256cfd37068c7' into am-b7f1a67b-2024-4274-aa7d-e88e8cceb407 am: 9a35ab6a4f am: f707f1bb88 am: 2b9a343319 -s ours am: 8e7c2624bb
...
am: 82208b730f
2018-06-01 16:38:22 -07: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
