OSDN Git Service
Jaegeuk Kim [Thu, 13 Sep 2018 20:12:32 +0000 (13:12 -0700)]
Merge "fix wrong ioctl direction for F2FS_IOC_GET_PIN_FILE" am:
3a7f95af09
am:
d305bbc526
Change-Id: I081acbf5462c972af270f9e68926dae1b49a0c8f
Jaegeuk Kim [Thu, 13 Sep 2018 19:49:30 +0000 (12:49 -0700)]
Merge "fix wrong ioctl direction for F2FS_IOC_GET_PIN_FILE"
am:
3a7f95af09
Change-Id: I74d6b44bb7de16b57e9ed0b42cec70e7633b28e1
Treehugger Robot [Thu, 13 Sep 2018 19:03:41 +0000 (19:03 +0000)]
Merge "fix wrong ioctl direction for F2FS_IOC_GET_PIN_FILE"
Jaegeuk Kim [Wed, 12 Sep 2018 17:10:51 +0000 (10:10 -0700)]
fix wrong ioctl direction for F2FS_IOC_GET_PIN_FILE
Change-Id: I0cf212c3e1770e233ae1f70e7fc4a6d70b82583e
Signed-off-by: Jaegeuk Kim <jaegeuk@google.com>
Jeff Sharkey [Tue, 11 Sep 2018 21:04:12 +0000 (14:04 -0700)]
Merge "vold should be fully developed in AOSP." am:
de85ef5c37
am:
d7b918f9f3
Change-Id: I67eba7b8c6cf076314f5848e4623419931c5131a
Jeff Sharkey [Tue, 11 Sep 2018 21:00:11 +0000 (14:00 -0700)]
Merge "vold should be fully developed in AOSP."
am:
de85ef5c37
Change-Id: I41da6719f6d9fc4a358bb8a0d99358360d779182
Treehugger Robot [Tue, 11 Sep 2018 20:50:05 +0000 (20:50 +0000)]
Merge "vold should be fully developed in AOSP."
Jeff Sharkey [Tue, 11 Sep 2018 17:25:23 +0000 (11:25 -0600)]
vold should be fully developed in AOSP.
Bug:
113136846
Test: manual
Change-Id: Ifdd54260153d47e47aca5f422bffcc828d45dc28
Jaegeuk Kim [Mon, 13 Aug 2018 22:42:34 +0000 (15:42 -0700)]
Merge "vold: Grant root group" am:
732def209c
am:
66166118d2
Change-Id: I4fa1f6c4f0c58ef8c51e1648bf00daab2aa0f5a6
Jaegeuk Kim [Mon, 13 Aug 2018 21:06:05 +0000 (14:06 -0700)]
Merge "vold: Grant root group"
am:
732def209c
Change-Id: If13da04a9cff5a54665626397b9c6bc165df10c7
Treehugger Robot [Mon, 13 Aug 2018 20:54:13 +0000 (20:54 +0000)]
Merge "vold: Grant root group"
Jaegeuk Kim [Tue, 7 Aug 2018 19:31:05 +0000 (12:31 -0700)]
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>
Paul Crowley [Wed, 8 Aug 2018 19:00:18 +0000 (12:00 -0700)]
Merge "Switch pattern/PIN constants to match values in cryptfs.h" am:
92f5db4a06 am:
6d418929f0
am:
a2c5a6b3c2
Change-Id: I93c28ad038ce7bf45e7eff8a1754272a1669ed67
Paul Crowley [Wed, 8 Aug 2018 18:33:12 +0000 (11:33 -0700)]
Merge "Switch pattern/PIN constants to match values in cryptfs.h" am:
92f5db4a06
am:
6d418929f0
Change-Id: I68dc3538393c51c2055535eb55587ebb7b697ba7
Greg Kaiser [Wed, 8 Aug 2018 18:18:19 +0000 (11:18 -0700)]
Merge "cryptfs: Remove Speck support" am:
cf0cb0bc1f am:
421e1059b7
am:
1bc4f99b35
Change-Id: I269b8702e27c1849cd121e5152135eeb9136fc50
Greg Kaiser [Wed, 8 Aug 2018 18:05:38 +0000 (11:05 -0700)]
Merge "cryptfs: Remove Speck support" am:
cf0cb0bc1f
am:
421e1059b7
Change-Id: I26fe4bc95f91f410cf1242e698e94ed4231c01ee
Paul Crowley [Wed, 8 Aug 2018 18:01:30 +0000 (11:01 -0700)]
Merge "Switch pattern/PIN constants to match values in cryptfs.h"
am:
92f5db4a06
Change-Id: I6eb0b99b9fbd25ed8f189cbc914a9a3bd7cb3069
Greg Kaiser [Wed, 8 Aug 2018 17:41:09 +0000 (10:41 -0700)]
Merge "cryptfs: Remove Speck support"
am:
cf0cb0bc1f
Change-Id: I4e44dd132d94b7583ab2df50469ac80bf9ae7a9b
Xin Li [Wed, 8 Aug 2018 06:46:10 +0000 (23:46 -0700)]
Merge "Merge Android Pie into master" am:
7fcaa13d4c am:
2042258f38
am:
ae4709298d
Change-Id: I11cc89572c973a77f8b74c670657225f97c42791
Xin Li [Wed, 8 Aug 2018 02:20:42 +0000 (19:20 -0700)]
Merge "Merge Android Pie into master" am:
7fcaa13d4c
am:
2042258f38
Change-Id: If376d606aa23dbb916bc8255da9febc5f095ca5a
Xin Li [Tue, 7 Aug 2018 22:51:17 +0000 (15:51 -0700)]
Merge "Merge Android Pie into master"
am:
7fcaa13d4c
Change-Id: I99ee2ff5662766207659cfa1afc9f337f238c781
Treehugger Robot [Tue, 7 Aug 2018 22:03:11 +0000 (22:03 +0000)]
Merge "Switch pattern/PIN constants to match values in cryptfs.h"
Treehugger Robot [Tue, 7 Aug 2018 21:11:50 +0000 (21:11 +0000)]
Merge "cryptfs: Remove Speck support"
Greg Kaiser [Tue, 7 Aug 2018 18:42:46 +0000 (11:42 -0700)]
cryptfs: Remove Speck support
am:
17059fe53b
Change-Id: I86d4cc91776ba8c2653d14d609403ab98e98ba64
Greg Kaiser [Wed, 1 Aug 2018 20:15:19 +0000 (13:15 -0700)]
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
(
38723f23ff521e95ed295f500e6529c52a994c9f) 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
Paul Crowley [Tue, 3 Jul 2018 18:49:00 +0000 (11:49 -0700)]
Switch pattern/PIN constants to match values in cryptfs.h
Bug:
111051602
Test: Steps to reproduce in b/
111051602
Change-Id: I21955f41d2594917d5baa1bc4d61da0106cd9170
Greg Kaiser [Wed, 1 Aug 2018 20:15:19 +0000 (13:15 -0700)]
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
(
38723f23ff521e95ed295f500e6529c52a994c9f) 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
Xin Li [Tue, 7 Aug 2018 16:51:28 +0000 (16:51 +0000)]
Merge "Merge Android Pie into master"
Xin Li [Mon, 6 Aug 2018 23:52:51 +0000 (16:52 -0700)]
Merge Android Pie into master
Bug:
112104996
Change-Id: Ibda46522d646c0a391c7d19663e4ffdb3d4b30fc
Jaegeuk Kim [Sat, 4 Aug 2018 00:21:37 +0000 (17:21 -0700)]
Merge "secdiscard: should pin_file to avoid moving blocks in F2FS" am:
cb114c36d8 am:
b7b419541b
am:
2db64225ca
Change-Id: I01b1903a5d47188432f1eec5d522ead77db18675
Jaegeuk Kim [Sat, 4 Aug 2018 00:11:47 +0000 (17:11 -0700)]
Merge "secdiscard: should pin_file to avoid moving blocks in F2FS" am:
cb114c36d8
am:
b7b419541b
Change-Id: I00d955ad5e8671c57b6a3acbe1e694fbf0b28d69
Jaegeuk Kim [Fri, 3 Aug 2018 23:55:37 +0000 (16:55 -0700)]
Merge "secdiscard: should pin_file to avoid moving blocks in F2FS"
am:
cb114c36d8
Change-Id: I3376ce6a9844d26c4e5658fc95477b8d6c9c0afe
Treehugger Robot [Fri, 3 Aug 2018 23:23:40 +0000 (23:23 +0000)]
Merge "secdiscard: should pin_file to avoid moving blocks in F2FS"
Jaegeuk Kim [Thu, 2 Aug 2018 19:41:45 +0000 (12:41 -0700)]
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>
Jaegeuk Kim [Mon, 30 Jul 2018 20:22:02 +0000 (13:22 -0700)]
vold: meta encryption: fix /dev/block/by-name/userdata to dm-3
am:
31e962fe19
Change-Id: Ib7324e29b7384bc7c1c847ce62af5230fa8a0081
Jaegeuk Kim [Sun, 29 Jul 2018 13:56:57 +0000 (06:56 -0700)]
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>
Stephen Hines [Wed, 25 Jul 2018 03:31:59 +0000 (20:31 -0700)]
[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
Change-Id: I359147fb152042f803c373d26ed96ba79ca55904
Stephen Hines [Wed, 25 Jul 2018 03:27:59 +0000 (20:27 -0700)]
[automerger skipped] Merge "Use std::move() to prevent unnecessary copying. [DO NOT MERGE]" am:
9b18b764bc -s ours
am:
2abec98856 -s ours
Change-Id: I53771e374afee33e97cdd34820ba46e1858621bf
Stephen Hines [Wed, 25 Jul 2018 03:25:09 +0000 (20:25 -0700)]
[automerger skipped] Merge "Use std::move() to prevent unnecessary copying. [DO NOT MERGE]"
am:
9b18b764bc -s ours
Change-Id: I15fbe10ff91d910478dd67c93fbd9bff8f3fee36
Treehugger Robot [Wed, 25 Jul 2018 03:15:21 +0000 (03:15 +0000)]
Merge "Use std::move() to prevent unnecessary copying. [DO NOT MERGE]"
Stephen Hines [Fri, 20 Jul 2018 18:19:53 +0000 (11:19 -0700)]
Use std::move() to prevent unnecessary copying. [DO NOT MERGE]
Bug: http://b/
110779387
Test: Builds with new toolchain.
Change-Id: I735a3ecda11a662edaddbe21c36433a91bb8a7f1
Bowgo Tsai [Tue, 3 Jul 2018 02:07:37 +0000 (19:07 -0700)]
Merge "Do not unmount /mnt/product/* when vold starts" am:
4a625453bf
am:
3d4fb41f3d
Change-Id: I264a9ed62e8c1884e928fe17edd35cf99a382129
Bowgo Tsai [Tue, 3 Jul 2018 02:03:58 +0000 (19:03 -0700)]
Merge "Do not unmount /mnt/product/* when vold starts"
am:
4a625453bf
Change-Id: Idd91865540106b5030f74b26037b61c00719ef28
Treehugger Robot [Tue, 3 Jul 2018 00:21:01 +0000 (00:21 +0000)]
Merge "Do not unmount /mnt/product/* when vold starts"
Tri Vo [Fri, 29 Jun 2018 17:00:34 +0000 (10:00 -0700)]
[automerger skipped] Merge "Exclude /mnt/vendor from vold's ownership." am:
4a634e3d8c -s ours
am:
8d4da29312 -s ours
Change-Id: Ifa9dceb3573d14683922a84ebe8021adb6ffd12e
Tri Vo [Fri, 29 Jun 2018 16:57:13 +0000 (09:57 -0700)]
[automerger skipped] Merge "Exclude /mnt/vendor from vold's ownership."
am:
4a634e3d8c -s ours
Change-Id: I71402c01429c1cd6c16e10398a7d3c0853fb19a4
Treehugger Robot [Fri, 29 Jun 2018 16:47:11 +0000 (16:47 +0000)]
Merge "Exclude /mnt/vendor from vold's ownership."
Bowgo Tsai [Fri, 29 Jun 2018 02:31:07 +0000 (10:31 +0800)]
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
Tri Vo [Mon, 16 Apr 2018 21:27:10 +0000 (14:27 -0700)]
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
bca5cd78fe14292079e2ffd63912f51e974c7fc3)
Logan Chien [Tue, 26 Jun 2018 02:12:55 +0000 (19:12 -0700)]
[automerger skipped] Merge changes I1f9b7b13,I36bc4a44 am:
17a93d5001 -s ours
am:
cc99436c66 -s ours
Change-Id: Icce3dc07b1efda15a0d48ecf78da002102f87bdc
Logan Chien [Tue, 26 Jun 2018 02:09:39 +0000 (19:09 -0700)]
[automerger skipped] Merge changes I1f9b7b13,I36bc4a44
am:
17a93d5001 -s ours
Change-Id: I94cd57d89e0c2091e7b9c645103b736e1e0e789a
Logan Chien [Tue, 26 Jun 2018 02:04:17 +0000 (02:04 +0000)]
Merge changes I1f9b7b13,I36bc4a44
* changes:
Deprecate <cutils/log.h> and <utils/Log.h>
Replace SLOG() with LOG(ERROR)
Logan Chien [Mon, 23 Apr 2018 05:37:39 +0000 (13:37 +0800)]
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
Logan Chien [Mon, 25 Jun 2018 02:18:42 +0000 (10:18 +0800)]
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
3472e52fc259b6a549acece21d4901d99d6a421f.
Test: mma # it builds
Change-Id: I36bc4a4430fc16b2c1c2eb39a2ec4d888c1ae352
Merged-In: I70dc512f21459d1e25b187f24289002b2c7bc7af
Jeff Sharkey [Tue, 19 Jun 2018 23:38:24 +0000 (16:38 -0700)]
Merge "Rely on updated newfs_msdos for parameter tuning." am:
7d557e98be
am:
c1e10dc348
Change-Id: Ic43dd314add68268a55a04352570115631366353
Jeff Sharkey [Tue, 19 Jun 2018 23:34:37 +0000 (16:34 -0700)]
Merge "Rely on updated newfs_msdos for parameter tuning."
am:
7d557e98be
Change-Id: I20d1a2c9dd402aa85d61c4cf3d765c487ca697f9
Treehugger Robot [Tue, 19 Jun 2018 23:26:05 +0000 (23:26 +0000)]
Merge "Rely on updated newfs_msdos for parameter tuning."
Jeff Sharkey [Tue, 19 Jun 2018 21:34:43 +0000 (15:34 -0600)]
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
Josh Gao [Sat, 9 Jun 2018 16:11:57 +0000 (09:11 -0700)]
Merge "Fix double close in GetTreeBytes." am:
142702dc82
am:
45175c437f
Change-Id: Ie6c89c98d504b91e26987275db365849448b1dc2
Xin Li [Sat, 9 Jun 2018 11:11:26 +0000 (04:11 -0700)]
Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master
am:
12e0362fd8
Change-Id: I0f4e22435cd6b2f9beca188011cd3cdffab55671
Josh Gao [Sat, 9 Jun 2018 00:17:56 +0000 (17:17 -0700)]
Merge "Fix double close in GetTreeBytes."
am:
142702dc82
Change-Id: I1c9f259d4d372ef1a3c36a9f884e39b8003f7ff0
Treehugger Robot [Fri, 8 Jun 2018 23:34:41 +0000 (23:34 +0000)]
Merge "Fix double close in GetTreeBytes."
Xin Li [Fri, 8 Jun 2018 18:09:27 +0000 (11:09 -0700)]
Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master
Bug:
79597307
Change-Id: I98ee147a69f0cd3bbcf9fc89acfdc467c91d2b8c
Luis Hector Chavez [Tue, 5 Jun 2018 17:10:08 +0000 (10:10 -0700)]
resolve merge conflicts of
7bf98aa8a0c122aec9f3262fe1a24238d57ae8d0 to pi-dev-plus-aosp
BUG: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I08252155f04e8b414f2149d8b29e5e2fff6bcc82
Luis Hector Chavez [Mon, 4 Jun 2018 23:22:48 +0000 (16:22 -0700)]
Merge "vold: Avoid SIGSEGVs when fstab lacks /data"
am:
e3017e0b18
Change-Id: Ib426ece8c295f58750de2526e9ca91c24791b731
Treehugger Robot [Mon, 4 Jun 2018 20:49:41 +0000 (20:49 +0000)]
Merge "vold: Avoid SIGSEGVs when fstab lacks /data"
Luis Hector Chavez [Wed, 30 May 2018 22:47:50 +0000 (15:47 -0700)]
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
Jeff Sharkey [Fri, 1 Jun 2018 23:03:58 +0000 (16:03 -0700)]
[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
Jeff Sharkey [Fri, 1 Jun 2018 22:57:36 +0000 (15:57 -0700)]
[automerger skipped] Merge commit '
635193ab36302e5f65e99c7df2f256cfd37068c7' into am-
b7f1a67b-2024-4274-aa7d-
e88e8cceb407 am:
9a35ab6a4f am:
f707f1bb88
am:
2b9a343319 -s ours
Change-Id: Ibdcc6722750cfe7cb394a52d21de8e73ecdfd650
Jeff Sharkey [Fri, 1 Jun 2018 22:31:32 +0000 (15:31 -0700)]
Merge commit '
635193ab36302e5f65e99c7df2f256cfd37068c7' into am-
b7f1a67b-2024-4274-aa7d-
e88e8cceb407 am:
9a35ab6a4f
am:
f707f1bb88
Change-Id: I4d9e269f34cab043a7c437781187d9a47e0fa652
Jeff Sharkey [Fri, 1 Jun 2018 22:19:33 +0000 (15:19 -0700)]
Merge commit '
635193ab36302e5f65e99c7df2f256cfd37068c7' into am-
b7f1a67b-2024-4274-aa7d-
e88e8cceb407
am:
9a35ab6a4f
Change-Id: I273dc86e0b0580bef81e272a94043b269d7df402
Jeff Sharkey [Fri, 1 Jun 2018 22:03:06 +0000 (16:03 -0600)]
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
Android Build Merger (Role) [Fri, 1 Jun 2018 21:46:12 +0000 (21:46 +0000)]
[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
Android Build Merger (Role) [Fri, 1 Jun 2018 21:46:11 +0000 (21:46 +0000)]
[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
Android Build Merger (Role) [Fri, 1 Jun 2018 21:46:09 +0000 (21:46 +0000)]
[automerger] Require quotes when searching for blkid keys. am:
ee5c7318d7 am:
98bb129cd3 am:
0c5a0d65c9 am:
7e51f8d0c4 am:
53fe89bbad am:
5716ee6d7a
Change-Id: Icf5c0c0a0c4f4aec605182111dcedf16f5a4ab95
Android Build Merger (Role) [Fri, 1 Jun 2018 21:46:08 +0000 (21:46 +0000)]
[automerger] Require quotes when searching for blkid keys. am:
ee5c7318d7 am:
98bb129cd3 am:
0c5a0d65c9 am:
7e51f8d0c4 am:
53fe89bbad
Change-Id: I87042d7d1d7b2cf9baeb3f28fd9ab31e5f97f62a
Android Build Merger (Role) [Fri, 1 Jun 2018 21:46:06 +0000 (21:46 +0000)]
[automerger] Require quotes when searching for blkid keys. am:
ee5c7318d7 am:
98bb129cd3 am:
0c5a0d65c9 am:
7e51f8d0c4
Change-Id: I5f21e49be9c536e51dbaadde0bd53545dc8cbaae
Android Build Merger (Role) [Fri, 1 Jun 2018 21:46:05 +0000 (21:46 +0000)]
[automerger] Require quotes when searching for blkid keys. am:
ee5c7318d7 am:
98bb129cd3 am:
0c5a0d65c9
Change-Id: I585336447c06e09b499ad2656b731105f1ebc4c4
Android Build Merger (Role) [Fri, 1 Jun 2018 21:46:04 +0000 (21:46 +0000)]
[automerger] Require quotes when searching for blkid keys. am:
ee5c7318d7 am:
98bb129cd3
Change-Id: I91516dfd0a046aa2763df3c09ef6e8570d7f1b55
Android Build Merger (Role) [Fri, 1 Jun 2018 21:46:02 +0000 (21:46 +0000)]
[automerger] Require quotes when searching for blkid keys. am:
ee5c7318d7
Change-Id: If8422cf170db4e05dbe4cf6c1ed4ebf8126b0c71
Jeff Sharkey [Fri, 1 Jun 2018 17:31:39 +0000 (11:31 -0600)]
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
Josh Gao [Wed, 30 May 2018 02:05:16 +0000 (19:05 -0700)]
Fix double close in GetTreeBytes.
calculate_dir_size closes the fd that it receives.
Bug: http://b/
80446935
Test: treehugger
Change-Id: I56a428cd7eb78e56c55434628c1c7b2b87637c81
Shawn Willden [Thu, 17 May 2018 22:36:25 +0000 (15:36 -0700)]
Explain the rationale for not using StrongBox in vold.
am:
e763ed2aa3
Change-Id: I38d70389cec085fa44760ebe8bb0bd264b475e69
Shawn Willden [Thu, 17 May 2018 21:24:56 +0000 (15:24 -0600)]
Explain the rationale for not using StrongBox in vold.
Bug:
77338527
Test: Comment-only change.
Change-Id: I9f87e34854eabcc4c183553cf56a033970bb867e
Wei Wang [Thu, 17 May 2018 18:50:46 +0000 (11:50 -0700)]
Add rc file for wait_for_keymaster
am:
f5b085c13a
Change-Id: I67ed38f476466a284cf6090929d5c7ac8016b7e0
Wei Wang [Tue, 15 May 2018 23:12:20 +0000 (16:12 -0700)]
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
Dmitry Shmidt [Tue, 15 May 2018 20:35:52 +0000 (13:35 -0700)]
Merge "vold: Add nvme disk support" am:
6054bc3ded
am:
3a920e3f6e
Change-Id: Ie4946e65924fffae8b810b54658b64e34a543fb4
Dmitry Shmidt [Tue, 15 May 2018 20:25:50 +0000 (13:25 -0700)]
Merge "vold: Add nvme disk support"
am:
6054bc3ded
Change-Id: I1e4cfc3eaea77220c132e5e08683576059e8fe15
Treehugger Robot [Tue, 15 May 2018 19:33:57 +0000 (19:33 +0000)]
Merge "vold: Add nvme disk support"
Dmitry Shmidt [Sat, 12 May 2018 00:22:42 +0000 (17:22 -0700)]
vold: Add nvme disk support
Bug:
77482940
Test: Manual
Change-Id: Id0e7b3a0aa2083276109b0b2c9d1bcb81852582f
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Shawn Willden [Fri, 11 May 2018 16:45:32 +0000 (09:45 -0700)]
Merge "Do Keymaster HMAC key agreement in vold." into pi-dev
am:
a229dac0e7
Change-Id: I7fd1bc843ca31ca33e569e93047b1ce9e24e439c
TreeHugger Robot [Fri, 11 May 2018 16:38:40 +0000 (16:38 +0000)]
Merge "Do Keymaster HMAC key agreement in vold." into pi-dev
Paul Crowley [Fri, 11 May 2018 00:12:05 +0000 (17:12 -0700)]
Fix spurious error
am:
98a23a19d1
Change-Id: I82fbe9e616624917a9a8d2b7b968a4b0408eba58
Paul Crowley [Wed, 9 May 2018 20:01:16 +0000 (13:01 -0700)]
Fix spurious error
Bug:
79542247
Test: error no longer appears
Change-Id: I2cf91c8cd937b81041a47e4b64a882445a80eb0b
Paul Crowley [Thu, 10 May 2018 06:55:46 +0000 (23:55 -0700)]
add wait_for_keymaster
am:
8f82879901
Change-Id: I2f92e97d8f94b82500be3c371c84a5d3520bb643
Shawn Willden [Wed, 9 May 2018 14:12:10 +0000 (08:12 -0600)]
Do Keymaster HMAC key agreement in vold.
Bug:
79307225
Test: Boot
Change-Id: I6682e86076aa568907d94024ef175dbdede86557
Paul Crowley [Wed, 7 Feb 2018 22:41:26 +0000 (14:41 -0800)]
add wait_for_keymaster
Bug:
79228237
Test: boots with patch
Change-Id: I581bcd4c4dd92c5b7be70eb351ecba20225e1eee
Logan Chien [Tue, 8 May 2018 05:49:20 +0000 (22:49 -0700)]
[automerger skipped] Merge changes I3c14cfcf,I9d2ea66c,I9930105e am:
14540d9ceb
am:
b053bc0716 -s ours
Change-Id: I137a24f649b17abfba49d7f2f1d0a464d504aca4
Logan Chien [Tue, 8 May 2018 05:43:03 +0000 (22:43 -0700)]
Merge changes I3c14cfcf,I9d2ea66c,I9930105e
am:
14540d9ceb
Change-Id: I5fb6d27b98e0308f181f5bd2be8f1af967d37e42
Logan Chien [Tue, 8 May 2018 05:28:08 +0000 (05:28 +0000)]
Merge changes I3c14cfcf,I9d2ea66c,I9930105e
* changes:
Replace library headers with angle quotations
Reorder the include directives in cryptfs.cpp
Add linux/types.h to cryptfs.h
OSDN Git Service
