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
Paul Crowley
8f82879901
add wait_for_keymaster
...
Bug: 79228237
Test: boots with patch
Change-Id: I581bcd4c4dd92c5b7be70eb351ecba20225e1eee
2018-05-09 12:59:18 -07:00
Logan Chien
ba2861c225
[automerger skipped] Merge changes I3c14cfcf,I9d2ea66c,I9930105e am: 14540d9ceb
...
am: b053bc0716
2018-05-07 22:49:20 -07:00
Logan Chien
b053bc0716
Merge changes I3c14cfcf,I9d2ea66c,I9930105e
...
am: 14540d9ceb
2018-05-07 22:43:03 -07:00
Logan Chien
14540d9ceb
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
2018-05-08 05:28:08 +00:00
Logan Chien
196d5850f2
Replace library headers with angle quotations
...
This commit replaces the double quotations for library headers with
angle quotations.
Test: cd system/vold && mma
Change-Id: I3c14cfcf80f29173669409df548af84c1b39b96d
Merged-In: I3c14cfcf80f29173669409df548af84c1b39b96d
2018-05-02 12:18:45 +08:00
Logan Chien
862eef7ace
Reorder the include directives in cryptfs.cpp
...
This commit reorders the include directives in cryptfs.cpp so that
upcoming <cutils/log.h> change can be obvious.
Test: lunch aosp_walleye-userdebug && cd system/vold && mma
Change-Id: I9d2ea66c15b7b68014a67ba7c1420075953459ba
Merged-In: I9d2ea66c15b7b68014a67ba7c1420075953459ba
2018-05-02 12:18:38 +08:00
Logan Chien
83a5ad2731
Add linux/types.h to cryptfs.h
...
This commit adds <linux/types.h> to cryptfs.h because cryptfs.h uses
`__le16` and `__le32` which are defined in <linux/types.h>.
The absence of <linux/types.h> will become an error after we sort the
headers in the upcoming commits.
Test: cd system/vold && mma
Change-Id: I9930105ee86f80a29295b59596b21335c68a8e23
Merged-In: I9930105ee86f80a29295b59596b21335c68a8e23
2018-05-02 12:18:31 +08:00
Logan Chien
188b0ab7b3
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
2018-05-02 12:10:19 +08:00
Logan Chien
3f2b122cd2
Replace library headers with angle quotations
...
This commit replaces the double quotations for library headers with
angle quotations.
Test: cd system/vold && mma
Change-Id: I3c14cfcf80f29173669409df548af84c1b39b96d
2018-05-02 12:10:16 +08:00
Logan Chien
d557d76466
Reorder the include directives in cryptfs.cpp
...
This commit reorders the include directives in cryptfs.cpp so that
upcoming <cutils/log.h> change can be obvious.
Test: lunch aosp_walleye-userdebug && cd system/vold && mma
Change-Id: I9d2ea66c15b7b68014a67ba7c1420075953459ba
2018-05-02 12:09:39 +08:00
Logan Chien
0267ccf8a4
Add linux/types.h to cryptfs.h
...
This commit adds <linux/types.h> to cryptfs.h because cryptfs.h uses
`__le16` and `__le32` which are defined in <linux/types.h>.
The absence of <linux/types.h> will become an error after we sort the
headers in the upcoming commits.
Test: cd system/vold && mma
Change-Id: I9930105ee86f80a29295b59596b21335c68a8e23
2018-05-02 10:57:56 +08:00
android-build-team Robot
02033186f1
Snap for 4736748 from 4a04cad4ec to pi-release
...
Change-Id: Ifd2de532a5565bea18d42e5add7bb571dfe3a675
2018-04-22 07:22:02 +00:00
Jaegeuk Kim
53411c7cad
Merge "vold: Idle-maint calls device GC" into pi-dev
...
am: 4a04cad4ec
2018-04-20 17:31:08 -07:00
TreeHugger Robot
4a04cad4ec
Merge "vold: Idle-maint calls device GC" into pi-dev
2018-04-20 23:42:04 +00:00
android-build-team Robot
58c5b47163
Snap for 4728508 from b244714eea to pi-release
...
Change-Id: Ic923ff3934623757175b584211e25d5c1985ee43
2018-04-18 07:26:47 +00:00
Tri Vo
8337899103
Merge "Exclude /mnt/vendor from vold's ownership." into pi-dev
...
am: b244714eea
2018-04-17 13:42:34 -07:00
TreeHugger Robot
b244714eea
Merge "Exclude /mnt/vendor from vold's ownership." into pi-dev
2018-04-17 19:16:55 +00:00
Tri Vo
bca5cd78fe
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
2018-04-16 14:33:53 -07:00
Jaegeuk Kim
eefc5eebc3
vold: Idle-maint calls device GC
...
This activates device GCs in idle time.
F2FS GC = 7 mins
Trim = 1 mins
Dev GC = 2 mins
Bug: 63264275
Bug: 68721792
Change-Id: I843a742ef192ebe00d77c47a216d4200bc9ccb9d
Signed-off-by: Jaegeuk Kim <jaegeuk@google.com>
2018-04-16 09:54:41 -07:00
android-build-team Robot
ce0e340b52
Snap for 4713750 from 7db02ab5d1 to pi-release
...
Change-Id: I97cc3c029a776bbf27001558ec62416f4fe65c0b
2018-04-11 07:23:23 +00:00
Jaegeuk Kim
4e3a51ff18
vold: set f2fs feature bit
...
am: 7db02ab5d1
2018-04-10 21:08:04 -07:00
Jaegeuk Kim
7db02ab5d1
vold: set f2fs feature bit
...
Bug: 74604441
Bug: 67380979
Change-Id: Ifcb43fb4f8fbdf79e70cfa208af73073d815e254
Signed-off-by: Jaegeuk Kim <jaegeuk@google.com>
2018-04-06 11:54:31 -07:00
Daniel Rosenberg
eea3792845
Merge "Remove waitpid on UnMount" am: f6dbba8846
...
am: 1584dc0d1d
2018-04-03 13:49:04 -07:00
Daniel Rosenberg
1584dc0d1d
Merge "Remove waitpid on UnMount"
...
am: f6dbba8846
2018-04-03 13:37:19 -07:00
Treehugger Robot
f6dbba8846
Merge "Remove waitpid on UnMount"
2018-04-03 20:23:59 +00:00
android-build-team Robot
0137b5d428
Snap for 4696032 from c1903ad3d6 to pi-release
...
Change-Id: I600cc54993ca03fa247b8727706e30050784d2ee
2018-04-03 07:25:57 +00:00
Shawn Willden
27e7cc4e79
Disable use of StrongBox for encryption
...
am: c1903ad3d6
2018-04-02 20:50:49 +00:00
android-build-team Robot
586203c835
Snap for 4693621 from 385cb8c4d6 to pi-release
...
Change-Id: I15432bbe0009155670576f0d71e5fc30ce46845a
2018-04-01 07:25:50 +00:00
Shawn Willden
c1903ad3d6
Disable use of StrongBox for encryption
...
Until VerificationTokens are wired up, StrongBox can't work. Also,
this will reduce complications for early StrongBox testing.
Bug: 77338527
Test: Boot the device
Change-Id: I44a1577c388703aeecb2886e7db52084c17e2afd
2018-03-30 18:01:35 -07:00
Paul Crowley
7d1e0f305f
Gate use of allow_encrypt_override behind ro.crypto property
...
am: 385cb8c4d6
2018-03-29 23:23:58 +00:00
Paul Crowley
385cb8c4d6
Gate use of allow_encrypt_override behind ro.crypto property
...
Test: use adb set-virtual-disk to create a virtual partition
Bug: 25861755
Change-Id: I6a227a083c82321c8d4d2d9188091a6f7f0451f0
2018-03-29 13:39:21 -07:00
