Commit graph

2093 commits

Author SHA1 Message Date
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
Android Build Merger (Role)
7e51f8d0c4 [automerger] Require quotes when searching for blkid keys. am: ee5c7318d7 am: 98bb129cd3 am: 0c5a0d65c9
Change-Id: I585336447c06e09b499ad2656b731105f1ebc4c4
2018-06-01 21:46:05 +00:00
Android Build Merger (Role)
0c5a0d65c9 [automerger] Require quotes when searching for blkid keys. am: ee5c7318d7 am: 98bb129cd3
Change-Id: I91516dfd0a046aa2763df3c09ef6e8570d7f1b55
2018-06-01 21:46:04 +00:00
Android Build Merger (Role)
98bb129cd3 [automerger] Require quotes when searching for blkid keys. am: ee5c7318d7
Change-Id: If8422cf170db4e05dbe4cf6c1ed4ebf8126b0c71
2018-06-01 21:46:02 +00:00
Jeff Sharkey
ee5c7318d7 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
2018-06-01 21:12:54 +00:00
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
Shawn Willden
cb62773a99 Explain the rationale for not using StrongBox in vold.
am: e763ed2aa3

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

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

Change-Id: Ie4946e65924fffae8b810b54658b64e34a543fb4
2018-05-15 13:35:52 -07:00
Dmitry Shmidt
3a920e3f6e Merge "vold: Add nvme disk support"
am: 6054bc3ded

Change-Id: I1e4cfc3eaea77220c132e5e08683576059e8fe15
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
Shawn Willden
9bc120416b Merge "Do Keymaster HMAC key agreement in vold." into pi-dev
am: a229dac0e7

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

Change-Id: I82fbe9e616624917a9a8d2b7b968a4b0408eba58
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
Paul Crowley
07b28ebecd add wait_for_keymaster
am: 8f82879901

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

Change-Id: I137a24f649b17abfba49d7f2f1d0a464d504aca4
2018-05-07 22:49:20 -07:00
Logan Chien
b053bc0716 Merge changes I3c14cfcf,I9d2ea66c,I9930105e
am: 14540d9ceb

Change-Id: I5fb6d27b98e0308f181f5bd2be8f1af967d37e42
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
Jaegeuk Kim
53411c7cad Merge "vold: Idle-maint calls device GC" into pi-dev
am: 4a04cad4ec

Change-Id: I6a88f69f4eb1e9108ac0bf28a4066606000e1911
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
Tri Vo
8337899103 Merge "Exclude /mnt/vendor from vold's ownership." into pi-dev
am: b244714eea

Change-Id: Iefcaf167fe242f90ac715905f15dc88de0b154c8
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
Jaegeuk Kim
4e3a51ff18 vold: set f2fs feature bit
am: 7db02ab5d1

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

Change-Id: I6c2562f6fc075e8be7db2986e461f2c2dd092650
2018-04-03 13:49:04 -07:00
Daniel Rosenberg
1584dc0d1d Merge "Remove waitpid on UnMount"
am: f6dbba8846

Change-Id: I4e96e702bc9b2251cc2801a037177a2f7a154c75
2018-04-03 13:37:19 -07:00
Treehugger Robot
f6dbba8846 Merge "Remove waitpid on UnMount" 2018-04-03 20:23:59 +00:00
Shawn Willden
27e7cc4e79 Disable use of StrongBox for encryption
am: c1903ad3d6

Change-Id: Id3f2e2e0f695ebd8eaa1c3883f636a4773b96859
2018-04-02 20:50:49 +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

Change-Id: I91f057b853902b63028897640ba6bb8e3d13e223
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
Daniel Rosenberg
8b9a5b344e Remove waitpid on UnMount
Since we no longer have the Fuse Daemon, we won't ever
need to stop the daemon when unmounting.

Bug: 33808187
Test: Run "adb shell ps | grep -w Z"
          The sdcard daemon should not be listed.
Change-Id: I6bb9341785b711d81553393f7c3b56115c435236
2018-03-13 02:58:03 +00:00