Dan Albert
2ab88f0a77
Merge "Add missing include."
...
am: 45b09e9144
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
554d8679e7
Merge "Update fs_mgr_mount_all function"
...
am: 1d58bcf6d4
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
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
2016-09-06 11:42:15 -07:00
Chih-Hung Hsieh
9bf2a320e7
Merge "Fix google-explicit-constructor warnings in system/vold."
...
am: a3bcf26d93
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
aa668f3d13
Merge \"Fix clang-tidy performance warnings in system/vold.\"
...
am: e24d4eef9b
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
Chih-hung Hsieh
f5e9bc9517
Merge \\"Fix misc-macro-parentheses warnings in system/vold.\\" am: 786c536e84
...
am: c83c87e681
2016-06-22 21:33:37 +00:00
Chih-Hung Hsieh
c83c87e681
Merge \"Fix misc-macro-parentheses warnings in system/vold.\"
...
am: 786c536e84
2016-06-22 21:31:07 +00:00
Chih-hung Hsieh
786c536e84
Merge "Fix misc-macro-parentheses warnings in system/vold."
2016-06-22 21:21:16 +00:00
Chih-Hung Hsieh
aae793802b
Fix misc-macro-parentheses warnings in system/vold.
...
Add parentheses around macro arguments used beside operators.
Bug: 28705665
Change-Id: I44e954f15bf6b8279d0f857d5417b7cb457da779
2016-06-10 14:15:18 -07:00
Paul Crowley
ad4dcc2ff6
Two phases to set the password for disk encryption
...
am: a363036b44
2016-05-18 22:59:57 +00:00
Paul Crowley
a363036b44
Two phases to set the password for disk encryption
...
Revert "Revert "Two phases to set the password for disk encryption""
This reverts commit d402389290
2016-05-17 15:23:06 -07:00
Chih-Hung Hsieh
5dc0aa6e41
Merge "Fix misc-macro-parentheses warnings." am: 0c0f9228cf
...
am: 4ff367a593
2016-05-11 23:03:58 +00:00
Chih-Hung Hsieh
4ff367a593
Merge "Fix misc-macro-parentheses warnings."
...
am: 0c0f9228cf
2016-05-11 23:00:48 +00:00
Treehugger Robot
0c0f9228cf
Merge "Fix misc-macro-parentheses warnings."
2016-05-11 22:52:30 +00:00
Chih-Hung Hsieh
cc5d580858
Fix misc-macro-parentheses warnings.
...
Add parentheses around macro arguments used beside binary operators.
Bug: 28705665
Change-Id: I0731cb8b22b3a9bdadac6414473d90e8398a8e89
2016-05-11 15:05:05 -07:00
Paul Crowley
269bdbcab1
Merge "e4crypt_is_native has been moved into system/extras." into nyc-dev
...
am: cfa03d4a4c
2016-05-10 22:17:33 +00:00
Paul Crowley
cfa03d4a4c
Merge "e4crypt_is_native has been moved into system/extras." into nyc-dev
2016-05-10 22:12:49 +00:00
Paul Crowley
2f8b7d354c
Revert "Two phases to set the password for disk encryption"
...
am: d402389290
2016-05-10 21:19:51 +00:00
Paul Crowley
d402389290
Revert "Two phases to set the password for disk encryption"
...
This reverts commit 92c5eeb467
2016-05-10 20:36:43 +00:00
Paul Crowley
4d2d5244d6
e4crypt_is_native has been moved into system/extras.
...
Bug: 28318405
Change-Id: Id962764cf7fb5f58b769bf99aeb6d3d69cb66991
2016-05-10 08:43:07 -07:00
Paul Crowley
bc7cfa8fcc
Two phases to set the password for disk encryption
...
am: 92c5eeb467
2016-05-09 21:53:23 +00:00
Paul Crowley
92c5eeb467
Two phases to set the password for disk encryption
...
In one phase, we make the new password work, and in the second we make
it the only one which works ("fixation"). This means that we can set
the password in Gatekeeper between these two phases, and a crash
doesn't break things. Unlocking a user automatically fixates the
presented credential.
Bug: 28154455
Change-Id: I54623c8652f0c9f72dd60388a7dc0ab2d48e81c7
2016-05-06 11:09:39 -07:00
Paul Crowley
409c083781
Use a longer timeout on the disk encryption keys
...
am: b3de337
2016-04-27 23:45:26 +00:00
Paul Crowley
b3de337acd
Use a longer timeout on the disk encryption keys
...
Avoid a timeout error by extending the time allowed between getting
the auth token and decrypting the key from five to thirty seconds.
Bug: 28398766
Change-Id: I1dbb9e0e33707e7de4c1720ad1b8e153c77094b2
2016-04-27 12:58:41 -07:00
John Cormie
c1428a51c3
Merge "Unmount public sdcard filesystems before killing the fuse process." into nyc-dev
...
am: a4330be
2016-04-25 23:57:06 +00:00
John Cormie
a4330beb48
Merge "Unmount public sdcard filesystems before killing the fuse process." into nyc-dev
2016-04-25 23:49:28 +00:00
Martijn Coenen
f56b110919
Merge "Move vold (and sdcard childs) to foreground cpuset." into nyc-dev
...
am: 47ff14a
2016-04-25 18:03:49 +00:00
Martijn Coenen
47ff14ad38
Merge "Move vold (and sdcard childs) to foreground cpuset." into nyc-dev
2016-04-25 17:46:02 +00:00
John Cormie
25cc7e3c33
Unmount public sdcard filesystems before killing the fuse process.
...
Avoids ENOTCONN during eject for sdcard users.
Change-Id: I7b89ccaad4bb7af3639dc0b702168030a2f88366
Bug: 28268676
2016-04-19 22:34:52 +00:00
Paul Lawrence
e72c33872e
Merge "Don\'t start defaultcrypto twice" into nyc-dev
...
am: 0264d8f
2016-04-19 14:47:08 +00:00
Paul Lawrence
0264d8ff7c
Merge "Don't start defaultcrypto twice" into nyc-dev
2016-04-19 14:44:26 +00:00
Paul Lawrence
84274cc35c
Don't start defaultcrypto twice
...
The old way (using triggers) starts defaultcrypto twice because
queue_property_triggers_action retriggers the action.
Bug: 27452459
Change-Id: I715d5441f8ae0b820b680f6a75f51694c4420992
2016-04-18 15:39:04 -07:00
Jeff Sharkey
c85be2fc40
Consistent creation/destruction of user data.
...
am: be70c9a
2016-04-18 19:59:50 +00:00
Jeff Sharkey
be70c9ae22
Consistent creation/destruction of user data.
...
Preparing and destroying users currently needs to be split across
installd, system_server, and vold, since no single party has all the
required SELinux permissions.
Bug: 27896918, 25861755
Change-Id: Ieec14ccacfc7a3a5ab00df47ace7318feb900c38
2016-04-15 13:47:52 -06:00
Martijn Coenen
624ec66b26
Move vold (and sdcard childs) to foreground cpuset.
...
Bug: 24949295
Change-Id: I7118a374db90ede517a92f72763d624b9a234ea7
2016-04-15 14:30:40 +02:00
Elliott Hughes
ccd9dd53f8
resolve merge conflicts of 81fd991 to nyc-dev-plus-aosp
...
Change-Id: Iabda2c9ad05ed4aa0a078c5da40b887f36dd9328
2016-04-12 16:44:04 -07:00
Mattias Nissler
81fd991d8b
Merge "Switch to BoringSSL crypto."
...
am: af458c4
2016-04-12 23:27:37 +00:00
Elliott Hughes
af458c478a
Merge "Switch to BoringSSL crypto."
2016-04-12 23:12:35 +00:00
Dan Austin
8afff3bfe1
Merge "Address const issues in preparation for libcxx rebase." am: a4f7dad
...
am: 3cc69fa
2016-04-12 22:35:50 +00:00
Dan Austin
3cc69faa67
Merge "Address const issues in preparation for libcxx rebase."
...
am: a4f7dad
2016-04-12 22:33:13 +00:00
Dan Austin
a4f7dadd38
Merge "Address const issues in preparation for libcxx rebase."
2016-04-12 22:21:17 +00:00
Yabin Cui
008c7ddb1f
Merge "vold: write bootloader message directly." into nyc-dev
...
am: cbedcc3
2016-04-09 01:09:55 +00:00
Yabin Cui
cbedcc30b3
Merge "vold: write bootloader message directly." into nyc-dev
2016-04-08 21:03:43 +00:00
