Commit graph

2384 commits

Author SHA1 Message Date
Stephen Hines
dae4988a56 [automerger skipped] Merge "Use std::move() to prevent unnecessary copying. [DO NOT MERGE]" am: 9b18b764bc -s ours
am: 2abec98856  -s ours

Change-Id: I53771e374afee33e97cdd34820ba46e1858621bf
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  -s ours

Change-Id: I15fbe10ff91d910478dd67c93fbd9bff8f3fee36
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

Change-Id: Id7c6821ea7551cfd42b4f07427d71f14a979c2aa
2018-07-02 19:10:56 -07:00
Bowgo Tsai
1c1186618b Merge "Do not unmount /mnt/product/* when vold starts" am: 4a625453bf
am: 3d4fb41f3d

Change-Id: I264a9ed62e8c1884e928fe17edd35cf99a382129
2018-07-02 19:07:37 -07:00
Bowgo Tsai
3d4fb41f3d Merge "Do not unmount /mnt/product/* when vold starts"
am: 4a625453bf

Change-Id: Idd91865540106b5030f74b26037b61c00719ef28
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  -s ours

Change-Id: I8662beaf3bbe73c1b55b0c0459121cf8438ec5e4
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  -s ours

Change-Id: Ifa9dceb3573d14683922a84ebe8021adb6ffd12e
2018-06-29 10:00:34 -07:00
Tri Vo
8d4da29312 [automerger skipped] Merge "Exclude /mnt/vendor from vold's ownership."
am: 4a634e3d8c  -s ours

Change-Id: I71402c01429c1cd6c16e10398a7d3c0853fb19a4
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  -s ours

Change-Id: I8373d8294b5bfda97c60095794a77ffa7658b286
2018-06-25 19:16:02 -07:00
Logan Chien
fbce8d9426 [automerger skipped] Merge changes I1f9b7b13,I36bc4a44 am: 17a93d5001 -s ours
am: cc99436c66  -s ours

Change-Id: Icce3dc07b1efda15a0d48ecf78da002102f87bdc
2018-06-25 19:12:55 -07:00
Logan Chien
cc99436c66 [automerger skipped] Merge changes I1f9b7b13,I36bc4a44
am: 17a93d5001  -s ours

Change-Id: I94cd57d89e0c2091e7b9c645103b736e1e0e789a
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.

Test: mma  # it builds
Change-Id: I36bc4a4430fc16b2c1c2eb39a2ec4d888c1ae352
Merged-In: I70dc512f21459d1e25b187f24289002b2c7bc7af
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

Change-Id: Idada202672307a80455763009cc4152fc3db1216
2018-06-19 16:48:49 -07:00
Jeff Sharkey
fe8274f921 Merge "Rely on updated newfs_msdos for parameter tuning." am: 7d557e98be
am: c1e10dc348

Change-Id: Ic43dd314add68268a55a04352570115631366353
2018-06-19 16:38:24 -07:00
Jeff Sharkey
c1e10dc348 Merge "Rely on updated newfs_msdos for parameter tuning."
am: 7d557e98be

Change-Id: I20d1a2c9dd402aa85d61c4cf3d765c487ca697f9
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

Change-Id: I3a250a6cb64c838186fb1912191df4960e00a73f
2018-06-09 09:22:35 -07:00
Josh Gao
26f604eb5a Merge "Fix double close in GetTreeBytes." am: 142702dc82
am: 45175c437f

Change-Id: Ie6c89c98d504b91e26987275db365849448b1dc2
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

Change-Id: Ie73a7be635bcd7ac9015cdf943bd9518baddfe71
2018-06-09 07:37:48 -07:00
Xin Li
25f2262db7 Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master
am: 12e0362fd8

Change-Id: I0f4e22435cd6b2f9beca188011cd3cdffab55671
2018-06-09 04:11:26 -07:00
Josh Gao
45175c437f Merge "Fix double close in GetTreeBytes."
am: 142702dc82

Change-Id: I1c9f259d4d372ef1a3c36a9f884e39b8003f7ff0
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

Change-Id: If24a86438384bb89c47711ea68de2fd812f139bb
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

Change-Id: Ib426ece8c295f58750de2526e9ca91c24791b731
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

Change-Id: Ic16c610fccfee8e955f0614b01d1fea5b242b0b4
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

Change-Id: Id3d4b780bab0e36da7d6bb3abf932c947a8fad86
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  -s ours

Change-Id: Ibdcc6722750cfe7cb394a52d21de8e73ecdfd650
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

Change-Id: I4d9e269f34cab043a7c437781187d9a47e0fa652
2018-06-01 15:31:32 -07:00
Jeff Sharkey
f707f1bb88 Merge commit '635193ab36302e5f65e99c7df2f256cfd37068c7' into am-b7f1a67b-2024-4274-aa7d-e88e8cceb407
am: 9a35ab6a4f

Change-Id: I273dc86e0b0580bef81e272a94043b269d7df402
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