Commit graph

1676 commits

Author SHA1 Message Date
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
Chih-Hung Hsieh
1c1c4edb98 Merge "Fix google-explicit-constructor warnings in system/vold." am: a3bcf26d93
am: 9bf2a320e7

Change-Id: I8e1288bd16b8a1c968d890412b5d1bdf03e9ae7a
2016-08-02 20:34:51 +00:00
Chih-Hung Hsieh
9bf2a320e7 Merge "Fix google-explicit-constructor warnings in system/vold."
am: a3bcf26d93

Change-Id: I109b4e68954de019827eddca2001f4bcac91130d
2016-08-02 20:32:22 +00:00
Treehugger Robot
a3bcf26d93 Merge "Fix google-explicit-constructor warnings in system/vold." 2016-08-02 20:20:58 +00:00
Chih-Hung Hsieh
a4353671b1 Fix google-explicit-constructor warnings in system/vold.
Bug: 28341362
Change-Id: I14344b0cba134570bf87e7d61aa03503735dd794
Test: build with WITH_TIDY=1
2016-08-02 11:41:54 -07:00
Chih-hung Hsieh
0955770f88 Merge \\\\"Fix clang-tidy performance warnings in system/vold.\\\\" am: e24d4eef9b am: aa668f3d13 am: ed1c4cf456
am: 73a3576ef9

Change-Id: I7aa15c236ba857833b392e2eb5646f468761749a
2016-07-28 00:50:26 +00:00
Chih-Hung Hsieh
73a3576ef9 Merge \\\"Fix clang-tidy performance warnings in system/vold.\\\" am: e24d4eef9b am: aa668f3d13
am: ed1c4cf456

Change-Id: I345cfce27a2b20048953d85bb2dd39adc34190d8
2016-07-28 00:30:43 +00:00
Chih-hung Hsieh
ed1c4cf456 Merge \\"Fix clang-tidy performance warnings in system/vold.\\" am: e24d4eef9b
am: aa668f3d13

Change-Id: I7f175785ab17ad9107bd11e9cd4ff0a9a7cbd460
2016-07-27 23:20:23 +00:00
Chih-Hung Hsieh
aa668f3d13 Merge \"Fix clang-tidy performance warnings in system/vold.\"
am: e24d4eef9b

Change-Id: I8e882391fb343a5dd8b5cd32b2e7c087219334dc
2016-07-27 23:17:57 +00:00
Chih-hung Hsieh
e24d4eef9b Merge "Fix clang-tidy performance warnings in system/vold." 2016-07-27 22:42:50 +00:00
Chih-Hung Hsieh
11a2ce8da3 Fix clang-tidy performance warnings in system/vold.
* Use const reference type for for-loop index variables
  to avoid unnecessary copy.

Bug: 30413223
Change-Id: Id4d980ae8afec1374fc3be0b23f1c6a39bff86e0
Test: build with WITH_TIDY=1
2016-07-27 14:11:02 -07:00
Paul Crowley
a345c88826 Don\\'t try to fixate CE keys for ephemeral users am: 25a713873c
am: 048d4c8518

Change-Id: I0d612f2fda4595181331d0463a3080383cfb5950
2016-07-26 16:35:39 +00:00
Paul Crowley
048d4c8518 Don\'t try to fixate CE keys for ephemeral users
am: 25a713873c

Change-Id: I7ecf1fcc6763943c124a93c433f49274579851ae
2016-07-26 16:32:36 +00:00
Paul Crowley
25a713873c Don't try to fixate CE keys for ephemeral users
Ephemeral users don't have keys stored on disk at all, so it's neither
necessary nor possible to manipulate the disk keys here.

Bug: 30038313
Change-Id: Idc7ec1bfe1e8a6ffa6cee2f284dbe378097b08da
2016-07-25 15:55:36 -07:00
Paul Crowley
05863d294e Don\\'t fail if a key we want to delete is already deleted am: ab0b56aef3
am: 2fa4435fae

Change-Id: Ia94ef7372900449af7fabd2bffeb592f831b073d
2016-07-22 16:53:07 +00:00
Paul Crowley
2fa4435fae Don\'t fail if a key we want to delete is already deleted
am: ab0b56aef3

Change-Id: I08920a3e330443e7466f0acc924cd21dbebba4c4
2016-07-22 16:50:31 +00:00
Paul Crowley
ab0b56aef3 Don't fail if a key we want to delete is already deleted
This can happen when cleaning up stale users at boot time.

Bug: 30158800
Change-Id: I2733d8d525fc79b7f05eb2225b7e6e14c4da277f
2016-07-21 11:27:15 -07:00
Paul Crowley
77d41a0ab7 Don\\'t evict keys when we delete users am: abc253884f
am: 00256b54f2

Change-Id: Ia1d169adbfc93b7b588384b7655c82ed6338214d
2016-07-20 04:16:21 +00:00
Paul Crowley
00256b54f2 Don\'t evict keys when we delete users
am: abc253884f

Change-Id: I2628957c50469948e78a5f1f626c3ace44eccbc0
2016-07-20 04:13:49 +00:00