Commit graph

2331 commits

Author SHA1 Message Date
android-build-team Robot
31cfdaaa08 Merge cherrypicks of [4793640, 4793602, 4793603, 4793660, 4793604, 4793680, 4793681, 4793581, 4793582, 4793625, 4793626, 4793627, 4793628, 4793700, 4793701, 4793702, 4793703, 4793704, 4793705, 4793661, 4793720, 4793721, 4793722, 4793723, 4793724, 4793725, 4793726, 4793727, 4793728, 4793583, 4793740, 4793760, 4793662, 4793780, 4793729] into pi-release-2
Change-Id: I665794d270556b24de04163aad6fd27dc2fcc4a5
2018-08-16 16:41:06 +00:00
Greg Kaiser
e7d3304fee cryptfs: Remove Speck support
Remove the Speck encryption support. It was eventually
decided not to allow Speck in Android P, so this code
is no longer needed and wasn't used outside of testing.

Note we don't just "git revert" the original commit
(38723f23ff) because we want
to retain the infrastructure for allowing new types of
crypto algorithms in the future.

Bug: 112009351
Test: Attempted to setup a device with ro.crypto.fde_algorithm set to Speck, and Speck was rejected and the system defaulted to AES.
Change-Id: I69a8b4e8632f8d30b5b54783cb986ab42d4397d9
(cherry picked from commit 17059fe53b)
2018-08-16 16:40:49 +00:00
Jaegeuk Kim
66166118d2 Merge "vold: Grant root group"
am: 732def209c

Change-Id: If13da04a9cff5a54665626397b9c6bc165df10c7
2018-08-13 14:06:05 -07:00
Treehugger Robot
732def209c Merge "vold: Grant root group" 2018-08-13 20:54:13 +00:00
Jaegeuk Kim
c0eea5736e vold: Grant root group
When using make_f2fs to format a filesystem with quota enabled, make_f2fs
will write quota record with group id equtal to make_f2fs's execution
group id.
Vold shall run as root group so that make_f2fs forked by vold will enherit
vold's root group. Make_f2fs can then write quota record with group id for
root group and therefore kernel quota driver can find quota record for
root group.

Bug: 111775499
Change-Id: I0c1fef760597d1695586d24365200b25e2cf07e6
Signed-off-by: Light Hsieh <light.hsieh@mediatek.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@google.com>
2018-08-08 17:08:02 -07:00
Paul Crowley
a2c5a6b3c2 Merge "Switch pattern/PIN constants to match values in cryptfs.h" am: 92f5db4a06
am: 6d418929f0

Change-Id: I68dc3538393c51c2055535eb55587ebb7b697ba7
2018-08-08 11:33:12 -07:00
Greg Kaiser
1bc4f99b35 Merge "cryptfs: Remove Speck support" am: cf0cb0bc1f
am: 421e1059b7

Change-Id: I26fe4bc95f91f410cf1242e698e94ed4231c01ee
2018-08-08 11:05:38 -07:00
Paul Crowley
6d418929f0 Merge "Switch pattern/PIN constants to match values in cryptfs.h"
am: 92f5db4a06

Change-Id: I6eb0b99b9fbd25ed8f189cbc914a9a3bd7cb3069
2018-08-08 11:01:30 -07:00
Greg Kaiser
421e1059b7 Merge "cryptfs: Remove Speck support"
am: cf0cb0bc1f

Change-Id: I4e44dd132d94b7583ab2df50469ac80bf9ae7a9b
2018-08-08 10:41:09 -07:00
android-build-team Robot
ecc2701851 Snap for 4939496 from 17059fe53b to pi-qpr1-release
Change-Id: Id8422a6cb43aa012ff53dd70a684b3b3c859ec51
2018-08-08 03:15:27 +00:00
Xin Li
ae4709298d Merge "Merge Android Pie into master" am: 7fcaa13d4c
am: 2042258f38

Change-Id: If376d606aa23dbb916bc8255da9febc5f095ca5a
2018-08-07 19:20:42 -07:00
Xin Li
2042258f38 Merge "Merge Android Pie into master"
am: 7fcaa13d4c

Change-Id: I99ee2ff5662766207659cfa1afc9f337f238c781
2018-08-07 15:51:17 -07:00
Treehugger Robot
92f5db4a06 Merge "Switch pattern/PIN constants to match values in cryptfs.h" 2018-08-07 22:03:11 +00:00
Treehugger Robot
cf0cb0bc1f Merge "cryptfs: Remove Speck support" 2018-08-07 21:11:50 +00:00
Greg Kaiser
17059fe53b cryptfs: Remove Speck support
Remove the Speck encryption support. It was eventually
decided not to allow Speck in Android P, so this code
is no longer needed and wasn't used outside of testing.

Note we don't just "git revert" the original commit
(38723f23ff) because we want
to retain the infrastructure for allowing new types of
crypto algorithms in the future.

Bug: 112009351
Test: Attempted to setup a device with ro.crypto.fde_algorithm set to Speck, and Speck was rejected and the system defaulted to AES.
Change-Id: I69a8b4e8632f8d30b5b54783cb986ab42d4397d9
2018-08-07 10:19:23 -07:00
Paul Crowley
ca08c0a724 Switch pattern/PIN constants to match values in cryptfs.h
Bug: 111051602
Test: Steps to reproduce in b/111051602
Change-Id: I21955f41d2594917d5baa1bc4d61da0106cd9170
2018-08-07 10:19:05 -07:00
Greg Kaiser
b353a61292 cryptfs: Remove Speck support
Remove the Speck encryption support. It was eventually
decided not to allow Speck in Android P, so this code
is no longer needed and wasn't used outside of testing.

Note we don't just "git revert" the original commit
(38723f23ff) because we want
to retain the infrastructure for allowing new types of
crypto algorithms in the future.

Bug: 112009351
Test: Attempted to setup a device with ro.crypto.fde_algorithm set to Speck, and Speck was rejected and the system defaulted to AES.
Change-Id: I69a8b4e8632f8d30b5b54783cb986ab42d4397d9
2018-08-07 10:11:05 -07:00
Xin Li
7fcaa13d4c Merge "Merge Android Pie into master" 2018-08-07 16:51:28 +00:00
Xin Li
25f0830ff1 Merge Android Pie into master
Bug: 112104996
Change-Id: Ibda46522d646c0a391c7d19663e4ffdb3d4b30fc
2018-08-06 16:52:51 -07:00
Jaegeuk Kim
2db64225ca Merge "secdiscard: should pin_file to avoid moving blocks in F2FS" am: cb114c36d8
am: b7b419541b

Change-Id: I00d955ad5e8671c57b6a3acbe1e694fbf0b28d69
2018-08-03 17:11:47 -07:00
Jaegeuk Kim
b7b419541b Merge "secdiscard: should pin_file to avoid moving blocks in F2FS"
am: cb114c36d8

Change-Id: I3376ce6a9844d26c4e5658fc95477b8d6c9c0afe
2018-08-03 16:55:37 -07:00
Treehugger Robot
cb114c36d8 Merge "secdiscard: should pin_file to avoid moving blocks in F2FS" 2018-08-03 23:23:40 +00:00
Jaegeuk Kim
ab515b2011 secdiscard: should pin_file to avoid moving blocks in F2FS
This file should avoid F2FS GC, since it directly access block device based
on fibmap.

Bug: 111659036
Change-Id: I15aef8175c23ba4029eb580e2dba59c77cca8227
Signed-off-by: Jaegeuk Kim <jaegeuk@google.com>
2018-08-02 14:17:17 -07:00
android-build-team Robot
81abfa2ca6 Snap for 4922203 from 31e962fe19 to pi-qpr1-release
Change-Id: Ia64205e7135bcd0ced71c3e82fe59ffeb23d760a
2018-07-31 03:11:07 +00: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
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
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
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
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
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
26f604eb5a Merge "Fix double close in GetTreeBytes." am: 142702dc82
am: 45175c437f

Change-Id: Ie6c89c98d504b91e26987275db365849448b1dc2
2018-06-09 09:11:57 -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