tequilaOS/platform_system_vold
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
2330 commits 1 branch 0 tags 9.7 MiB
Commit graph

2330 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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
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
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

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
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

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
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

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
android-build-team Robot
02033186f1 Snap for 4736748 from 4a04cad4ec to pi-release 
Change-Id: Ifd2de532a5565bea18d42e5add7bb571dfe3a675
 2018-04-22 07:22:02 +00:00