Commit graph

1509 commits

Author SHA1 Message Date
Andrew Scull
7ec25c715f Evict CE keys on request or when a user is removed.
A work around for a kernel bug is needed to avoid the phone locking up
and turning into a hand warmer.

Test: com.android.cts.devicepolicy.ManagedProfileTest#testLockNowWithKeyEviction*
Bug: 31000719
Change-Id: Ia2121b3e3c22b10351296fa998892a91e601bb2c
2016-12-14 11:13:20 +00:00
Paul Crowley
4315c6a0c3 Enable building and running the vold_tests module as part of a
standard build; make it use only static libraries as per documented
limitations of APCT.

Bug: 33384925
Test: This is a test.
Change-Id: I794adbfa3376795120cfbca1e9322093960009b5
2016-12-06 08:22:04 -08:00
Adrien Schildknecht
6218c51e4b Manually merge commit 'b406ffa' into stage-aosp-master am: 04c55e6ed7 am: 93722ead06
am: 43100e580f

Change-Id: I8a74fd730f0aa5a1f94c04c12286e96ac299b463
2016-12-03 04:20:13 +00:00
Adrien Schildknecht
43100e580f Manually merge commit 'b406ffa' into stage-aosp-master am: 04c55e6ed7
am: 93722ead06

Change-Id: I25c4f8f2f833360b39939360ad400e6ed21fc176
2016-12-03 04:15:10 +00:00
Adrien Schildknecht
93722ead06 Manually merge commit 'b406ffa' into stage-aosp-master
am: 04c55e6ed7

Change-Id: I77bbb46dfd8f49ed96c3f590d719b511eff55aa6
2016-12-03 04:13:11 +00:00
The Android Automerger
04c55e6ed7 Manually merge commit 'b406ffa' into stage-aosp-master
* commit 'b406ffa':
  Add support for creating ext4 images with mke2fs

BUG:33304034
2016-12-03 04:08:35 +00:00
Treehugger Robot
b406ffaa86 Merge "Add support for creating ext4 images with mke2fs" 2016-12-02 22:48:23 +00:00
Adrien Schildknecht
e0f409ca32 Add support for creating ext4 images with mke2fs
We are investigating replacing make_ext4fs with the upstream tool mke2fs.
See b/23686092 for more informations.

To mitigate the trouble that may arise if the new tool behave differently
compared to the old one, there will be a transition period where both mke2fs
and make_ext4fs will be supported.

This patch does 3 things:
  - add the necessary code to use mke2fs to format an ext4 partition;
  - add a dependency to the binary used by vold.

Test: m -j32 with TARGET_USES_MKE2FS={,false,true}
                  TARGET_USERIMAGES_USE_EXT4={,true}

Change-Id: I89222642fe1d11a035155c8224b84b2e3719938b
2016-11-22 18:46:37 -08:00
Paul Crowley
0b1d93b14b Merge "Remove misleading comment (b/26948053)" am: dbeebf56aa am: 4f70554179 am: 32b7443757
am: 6984a92aa9

Change-Id: I01c7376d6e25796eaa9448506d17eb318f3bdedb
2016-10-28 21:33:27 +00:00
Paul Crowley
6984a92aa9 Merge "Remove misleading comment (b/26948053)" am: dbeebf56aa am: 4f70554179
am: 32b7443757

Change-Id: I8b68a90f11d2b7b66085609a122515a68bac48bb
2016-10-28 21:25:23 +00:00
Paul Crowley
32b7443757 Merge "Remove misleading comment (b/26948053)" am: dbeebf56aa
am: 4f70554179

Change-Id: I18b4e8c975342a0b79d9a88082c1e9b4f0a6682b
2016-10-28 21:20:28 +00:00
Paul Crowley
4f70554179 Merge "Remove misleading comment (b/26948053)"
am: dbeebf56aa

Change-Id: I6e63f700ecd9cad50956cc2a1cc34b4f81b1a497
2016-10-28 21:14:50 +00:00
Treehugger Robot
dbeebf56aa Merge "Remove misleading comment (b/26948053)" 2016-10-28 21:08:17 +00:00
Rahul Chaudhry
d10d60ba98 Merge "system/vold: cleanup compiler warnings (read of uninitialized memory)." am: cda5cec39f am: e9e23bf019
am: 543080cdf3

Change-Id: Icf701e8675c8d50f81e3a8f0d0de5716c25696ef
2016-10-20 03:38:54 +00:00
Rahul Chaudhry
543080cdf3 Merge "system/vold: cleanup compiler warnings (read of uninitialized memory)." am: cda5cec39f
am: e9e23bf019

Change-Id: Ic4e45522f591c296f6975f288c5dccd059b00314
2016-10-20 03:29:37 +00:00
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