Commit graph

1644 commits

Author SHA1 Message Date
Rahul Chaudhry
e9e23bf019 Merge "system/vold: cleanup compiler warnings (read of uninitialized memory)."
am: cda5cec39f

Change-Id: I5fdde841ee42e3a48c042538732f22f0fe3eedf9
2016-10-20 03:21:06 +00:00
Treehugger Robot
cda5cec39f Merge "system/vold: cleanup compiler warnings (read of uninitialized memory)." 2016-10-20 03:15:25 +00:00
Rahul Chaudhry
1a077b440a system/vold: cleanup compiler warnings (read of uninitialized memory).
system/vold/ScryptParameters.cpp:48:26: warning: Assigned value is
garbage or undefined
system/vold/ScryptParameters.cpp:48:43: warning: Assigned value is
garbage or undefined
system/vold/ScryptParameters.cpp:48:9: warning: Assigned value is
garbage or undefined

Bug: 26936282
Test: WITH_TIDY=1 WITH_STATIC_ANALYZER=1 mm
Change-Id: I82ffffee48ee94ca5c7f3bbc64059f9cec109a92
2016-10-19 17:58:32 -07:00
Paul Crowley
99360d76e5 Remove misleading comment (b/26948053)
Vold is considered part of our trusted computing base, and
compromising vold is already identified as a complete device
compromise. While storing keys only in the kernel would be better, the
current setup does not introduce a security bug or worsen any security
control.

Bug: 26948053
Test: Comment-only change.
Change-Id: Ib5436f4386769ec44b74dc6b50fbcc0fed99b96b
2016-10-19 15:10:26 -07:00
Tao Bao
38e92167fd Merge "Use libbootloader_message." am: 1dfd1df2e3 am: df161ae45b
am: 2af30c5439

Change-Id: I18521613a44c07f4c1b39d41e1b8172207157982
2016-10-18 23:08:21 +00:00
Tao Bao
2af30c5439 Merge "Use libbootloader_message." am: 1dfd1df2e3
am: df161ae45b

Change-Id: I028c7712fd243d7d291add1b2864a198959a1d34
2016-10-18 23:01:10 +00:00
Tao Bao
df161ae45b Merge "Use libbootloader_message."
am: 1dfd1df2e3

Change-Id: Id9c27a97fc7a6e67a706d9f2d837e42a960fa19a
2016-10-18 22:54:30 +00:00
Tao Bao
1dfd1df2e3 Merge "Use libbootloader_message." 2016-10-18 21:48:23 +00:00
Yabin Cui
889ed48e5f Use libbootloader_message.
Bug: 29582118

Change-Id: I8de2cfbc62908011dba2ab86d17f977ebcfadac0
(cherry picked from commit 1fb5966fbb)
2016-10-16 17:04:46 -07:00
Tao Bao
3c2f1db5b8 Merge "Update the header path for ext4_utils." am: 6a18a6ddb5 am: 4759d1d637 am: e85d4467f5
am: 985d0805e7

Change-Id: I53d2076c94124687788232029fcad83b4f79541b
2016-10-10 23:01:43 +00:00
Tao Bao
985d0805e7 Merge "Update the header path for ext4_utils." am: 6a18a6ddb5 am: 4759d1d637
am: e85d4467f5

Change-Id: I78ef6034fc2586383e70345bcd186875528c9ffc
2016-10-10 22:14:58 +00:00
Tao Bao
e85d4467f5 Merge "Update the header path for ext4_utils." am: 6a18a6ddb5
am: 4759d1d637

Change-Id: Ia2d03836b7c194f641aa2c75b113a0a87e84e397
2016-10-10 21:46:17 +00:00
Tao Bao
4759d1d637 Merge "Update the header path for ext4_utils."
am: 6a18a6ddb5

Change-Id: I9f82c4f612ce5287b24e53ef151b886b91b0a0d7
2016-10-10 21:15:02 +00:00
Tao Bao
6a18a6ddb5 Merge "Update the header path for ext4_utils." 2016-10-10 20:07:32 +00:00
Tao Bao
5a95ddbacf Update the header path for ext4_utils.
Test: mmma system/vold

Change-Id: I805b8874b05b8043390c2cd3c143cc469913c067
(cherry picked from commit 989fec2769)
2016-10-07 16:54:29 -07:00
Tao Bao
989fec2769 Update the header path for ext4_utils.
Test: mmma system/vold

Change-Id: I805b8874b05b8043390c2cd3c143cc469913c067
2016-10-05 23:12:49 -07:00
Andreas Gampe
b71f1448ee Merge "Vold: remove unused define" am: 7ac97f8e37 am: de114c0d89 am: dd0fc053d2
am: 32e3190d10

Change-Id: Ib391bcc98f072200418c9827b848ed718f7a9148
2016-09-24 17:24:16 +00:00
Andreas Gampe
32e3190d10 Merge "Vold: remove unused define" am: 7ac97f8e37 am: de114c0d89
am: dd0fc053d2

Change-Id: I2d223f85f22929ed531d6fabb86cfbe2727aa71b
2016-09-24 16:49:04 +00:00
Andreas Gampe
dd0fc053d2 Merge "Vold: remove unused define" am: 7ac97f8e37
am: de114c0d89

Change-Id: Ida80b4ef12a7fcccadd219c7a7a4151a6f1b6098
2016-09-24 16:46:42 +00:00
Andreas Gampe
de114c0d89 Merge "Vold: remove unused define"
am: 7ac97f8e37

Change-Id: I617533e47e28a8081f7a2f477bda0c44fb3ea992
2016-09-24 16:44:43 +00:00
Treehugger Robot
7ac97f8e37 Merge "Vold: remove unused define" 2016-09-24 16:39:05 +00:00
Andreas Gampe
1ee738cd45 Vold: remove unused define
Introduced in commit 36801cccf2,
but never used.

Test: m
Bug: 31338270
Change-Id: I90bbab0208032b75b3700b02f0dc053b0e5ed38a
2016-09-23 18:02:49 -07:00
Dan Albert
e89c12f4f0 Merge "Add missing include." am: 45b09e9144 am: 2ab88f0a77 am: 9d7bf437b0
am: 5ee8b78072

Change-Id: I462ba50baf0741f67d28bb935542b708e35fa56a
2016-09-22 09:26:57 +00:00
Dan Albert
5ee8b78072 Merge "Add missing include." am: 45b09e9144 am: 2ab88f0a77
am: 9d7bf437b0

Change-Id: Id77fcbc8bffc2e45a0b1d3f5e4ac5fdc195711be
2016-09-22 09:16:19 +00:00
Dan Albert
9d7bf437b0 Merge "Add missing include." am: 45b09e9144
am: 2ab88f0a77

Change-Id: I84171fb41e8cd0040da34891d9b527400ff49b3f
2016-09-21 23:42:36 +00:00
Dan Albert
2ab88f0a77 Merge "Add missing include."
am: 45b09e9144

Change-Id: I97b57690ed9cccd71b0c3d9b83fb1fd0f2e3d835
2016-09-21 23:22:29 +00:00
Treehugger Robot
45b09e9144 Merge "Add missing include." 2016-09-21 22:40:09 +00:00
Dan Albert
616b250ecf Add missing include.
Test: mm
Bug: None
Change-Id: If3cbe642292016fdac603cce83f3ef252dda7481
2016-09-21 13:57:53 -07:00
Wei Wang
0f141a6846 Update fs_mgr_mount_all function am: 84c985e275 am: c3c04acae6
am: b2c339739b

Change-Id: I505cae6837e0f175123823738e953fc05a504962
2016-09-07 18:08:31 +00:00
Wei Wang
b2c339739b Update fs_mgr_mount_all function am: 84c985e275
am: c3c04acae6

Change-Id: Iaf67826394328097426ea9ee605ec2908f67ebec
2016-09-07 17:58:40 +00:00
Wei Wang
c3c04acae6 Update fs_mgr_mount_all function
am: 84c985e275

Change-Id: Ia2d7410d092d7569c8f8873a101140db9320c019
2016-09-07 17:53:30 +00:00
Wei Wang
c5884fcfbf Merge "Update fs_mgr_mount_all function" am: 1d58bcf6d4 am: 554d8679e7 am: 02a52f1f10
am: bb4611b43b

Change-Id: I28d7a286ed8d4465383268263c44680538336c34
2016-09-06 20:24:37 +00:00
Wei Wang
bb4611b43b Merge "Update fs_mgr_mount_all function" am: 1d58bcf6d4 am: 554d8679e7
am: 02a52f1f10

Change-Id: Ie242ec19217b81a76dd3fd046ff8157bd3691381
2016-09-06 20:21:07 +00:00
Wei Wang
02a52f1f10 Merge "Update fs_mgr_mount_all function" am: 1d58bcf6d4
am: 554d8679e7

Change-Id: Id6a99695c437c37b60e8e03eff9ff60eb91707a0
2016-09-06 20:18:06 +00:00
Wei Wang
554d8679e7 Merge "Update fs_mgr_mount_all function"
am: 1d58bcf6d4

Change-Id: Ic0c4c94cc6432d42229b9f66d95ea64cd49fa5f6
2016-09-06 20:14:37 +00:00
Wei Wang
1d58bcf6d4 Merge "Update fs_mgr_mount_all function" 2016-09-06 20:05:57 +00:00
Wei Wang
84c985e275 Update fs_mgr_mount_all function
This is part of the change to support early/late fstab mounting in order
to support starting key services before /data mounting
fs_mgr_mount_all function updated with a parameter to support mounting mode
More information refer to init/readme.txt

(cherry picked from commit 1d6476c3c8)

Bug: 30118894
Change-Id: I5e925b900fd477f230a90514cc2b561c7a7e9f49
2016-09-06 12:53:38 -07:00
Wei Wang
c03f1798f7 Update fs_mgr_mount_all function
This is part of the change to support early/late fstab mounting in order
to support starting key services before /data mounting
fs_mgr_mount_all function updated with a parameter to support mounting mode
More information refer to init/readme.txt

(cherry picked from commit 1d6476c3c8)

Bug: 30118894
Change-Id: I5e925b900fd477f230a90514cc2b561c7a7e9f49
2016-09-06 11:42:15 -07:00
Wei Wang
0b71e6faf5 Merge "Update fs_mgr_mount_all function" 2016-09-06 18:23:54 +00:00
Jeff Sharkey
28e3a0a4d7 DO NOT MERGE. Block adoptable storage when using FBE. am: 84be704af4 am: 1fbe38f424
am: 697cd037ad  -s ours

Change-Id: Ie92c12f205634ff4658ebfc7511eefd65495ad5b
2016-09-01 01:08:16 +00:00
Jeff Sharkey
697cd037ad DO NOT MERGE. Block adoptable storage when using FBE. am: 84be704af4
am: 1fbe38f424

Change-Id: I7331a05a5d40d8cf1d946971e86097e716580094
2016-08-31 23:56:45 +00:00
Jeff Sharkey
1fbe38f424 DO NOT MERGE. Block adoptable storage when using FBE.
am: 84be704af4

Change-Id: If12088f04915fb4e7c239a7d0d90aa945183611d
2016-08-31 23:35:13 +00:00
Jeff Sharkey
84be704af4 DO NOT MERGE. Block adoptable storage when using FBE.
For adoptable storage and FBE to coexist we need a new dm-biocrypt
kernel feature which isn't ready yet.  So for now, prevent devices
from being adopted on FBE devices.

Bug: 30770036
Change-Id: I47639209161ee403ce13ea9a60da235e97c3fc30
(cherry picked from commit 1571751109)
2016-08-31 21:42:32 +00:00
Wei Wang
1d6476c3c8 Update fs_mgr_mount_all function
This is part of the change to support early/late fstab mounting in order
to support starting key services before /data mounting
fs_mgr_mount_all function updated with a parameter to support mounting mode
More information refer to init/readme.txt

Bug: 30118894
Change-Id: I5e925b900fd477f230a90514cc2b561c7a7e9f49
2016-08-30 17:14:44 -07:00
TreeHugger Robot
f8b14520ca Merge "Blocking mode for debugging purposes." 2016-08-23 22:45:59 +00:00
Jeff Sharkey
1571751109 Block adoptable storage when using FBE.
For adoptable storage and FBE to coexist we need a new dm-biocrypt
kernel feature which isn't ready yet.  So for now, prevent devices
from being adopted on FBE devices.

Bug: 30770036
Change-Id: I47639209161ee403ce13ea9a60da235e97c3fc30
2016-08-23 13:49:00 -06:00
Paul Crowley
dff8c727c1 Support Keymaster 2 configuration and key upgrading
Bug: 27212248
Change-Id: I96bd9a442f4f535ba6ea44c9e81bcc1fee0ec471
2016-08-15 13:58:37 -07:00
Jeff Sharkey
fce701b5f1 Blocking mode for debugging purposes.
The default non-blocking mode doesn't log stdout/err from the
commands exec'ed during a move.

Bug: 29923055
Change-Id: I9de3fe9bfcfa3c1d39a32ecc89dd765202460376
2016-08-10 17:41:19 +00:00
Chih-Hung Hsieh
0fe14bdd1c Merge "Fix google-explicit-constructor warnings in system/vold." am: a3bcf26d93 am: 9bf2a320e7 am: 1c1c4edb98
am: 3634db02a4

Change-Id: I4ce806283833c3fe8bcb713726e7fc3c0d087c90
2016-08-02 20:46:54 +00:00
Chih-Hung Hsieh
3634db02a4 Merge "Fix google-explicit-constructor warnings in system/vold." am: a3bcf26d93 am: 9bf2a320e7
am: 1c1c4edb98

Change-Id: I0493425398506c29c364965eb20e45cdaa1f9f1f
2016-08-02 20:37:24 +00:00