Paul Crowley
269bdbcab1
Merge "e4crypt_is_native has been moved into system/extras." into nyc-dev
...
am: cfa03d4a4c
* commit 'cfa03d4a4c53acf41dca2c41a2efd00de06043bb':
e4crypt_is_native has been moved into system/extras.
Change-Id: Id199621d0e5544acadc4a4d4308a80c47b9ea3c8
8 years ago
Paul Crowley
cfa03d4a4c
Merge "e4crypt_is_native has been moved into system/extras." into nyc-dev
8 years ago
Android Build Merger (Role)
8d5165ab0f
Merge "Revert "Two phases to set the password for disk encryption" am: d402389290
am: 26642bf7bf" into nyc-mr1-dev-plus-aosp
8 years ago
Paul Crowley
aa79651bcd
Revert "Two phases to set the password for disk encryption" am: d402389290
...
am: 26642bf7bf
* commit '26642bf7bf8f645f3d10fe0d36149d5f8b3b92fb':
Revert "Two phases to set the password for disk encryption"
Change-Id: If0ecc2132c5012ccc9c28912170b2e91a451ac99
8 years ago
Paul Crowley
6a87b09b32
Revert "Two phases to set the password for disk encryption" am: d402389290
...
am: 2f8b7d354c
* commit '2f8b7d354c59b74cec719531728523bf19f88dce':
Revert "Two phases to set the password for disk encryption"
Change-Id: I89687b6a813caca0c214787d3e28d4e4106e7fe2
8 years ago
Paul Crowley
2f8b7d354c
Revert "Two phases to set the password for disk encryption"
...
am: d402389290
* commit 'd402389290eeef86be7eb9241e20fdd125d44eb1':
Revert "Two phases to set the password for disk encryption"
Change-Id: I09735798116dd4e37dda60651dc085a09090a99d
8 years ago
Paul Crowley
26642bf7bf
Revert "Two phases to set the password for disk encryption"
...
am: d402389290
* commit 'd402389290eeef86be7eb9241e20fdd125d44eb1':
Revert "Two phases to set the password for disk encryption"
Change-Id: I53a3804fc7bff9c99840aeee36fc4b7ff8e46ac1
8 years ago
Paul Crowley
d402389290
Revert "Two phases to set the password for disk encryption"
...
This reverts commit 92c5eeb467
.
Bug: 28694324
Change-Id: Ibbbaff287f4dd28f4a13e122a3617987a8875a44
8 years ago
Paul Crowley
4d2d5244d6
e4crypt_is_native has been moved into system/extras.
...
Bug: 28318405
Change-Id: Id962764cf7fb5f58b769bf99aeb6d3d69cb66991
8 years ago
Paul Crowley
a6bc1fea18
Two phases to set the password for disk encryption am: 92c5eeb467
...
am: 4e44272c3d
* commit '4e44272c3d1e2f5c0040acefc3812781aeea1736':
Change-Id: I0eb0825eee3faffb27736cdaf92b98983369ef47
8 years ago
Paul Crowley
c7e803bcc9
Two phases to set the password for disk encryption am: 92c5eeb467
...
am: bc7cfa8fcc
* commit 'bc7cfa8fcce8b09d308a7e511c5a2d4de530676a':
Two phases to set the password for disk encryption
Change-Id: Ifcde4025a0ce196c8208f802a6a5dfb4a24e2a0d
8 years ago
Paul Crowley
bc7cfa8fcc
Two phases to set the password for disk encryption
...
am: 92c5eeb467
* commit '92c5eeb46779f0fa1c9e6db6b0d632d960cbb2e4':
Two phases to set the password for disk encryption
Change-Id: Ie10cfc91d59f38359560682ca5e4133dc8700c12
8 years ago
Paul Crowley
4e44272c3d
Two phases to set the password for disk encryption
...
am: 92c5eeb467
* commit '92c5eeb46779f0fa1c9e6db6b0d632d960cbb2e4':
Two phases to set the password for disk encryption
Change-Id: I82c1cfa2874ac4709e42f5c2047c832cbcaccb91
8 years ago
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
8 years ago
Paul Lawrence
7b6ff76185
Merge "Drop caches after installing key policy to avoid cache clashes" into nyc-mr1-dev
...
am: 235e78b9ae
* commit '235e78b9aede9d4a7f871f5064670afab5cb2d6b':
Drop caches after installing key policy to avoid cache clashes
Change-Id: I766e87aa700bd0a1312faac33092b3a0d20b5fd1
8 years ago
Paul Lawrence
235e78b9ae
Merge "Drop caches after installing key policy to avoid cache clashes" into nyc-mr1-dev
8 years ago
Paul Lawrence
85e3d8cd50
Drop caches after installing key policy to avoid cache clashes
...
Note that this is an ugly workaround for a kernel bug.
Bug: 28373400
Change-Id: Iec1ae53f4e18f06e41e8cf1fcc3ab03fc9848632
8 years ago
Paul Crowley
1cc3cc59f6
Use a longer timeout on the disk encryption keys am: b3de337
...
am: 26335ed
* commit '26335ed378cd31a9c31669db8756ec317efd2e97':
Change-Id: I784a3b84675fdff4b5d228c3bc5acf6b106f5ec7
8 years ago
Paul Crowley
50da911fda
Use a longer timeout on the disk encryption keys am: b3de337
...
am: 409c083
* commit '409c083781f27b2924f051e8f7d130f62921ce1b':
Use a longer timeout on the disk encryption keys
Change-Id: I87cd4f37fdca430c3449471796ef24c3cbd7c225
8 years ago
Paul Crowley
409c083781
Use a longer timeout on the disk encryption keys
...
am: b3de337
* commit 'b3de337acd7ad07de1ed30d24fdfd628d1d8590b':
Use a longer timeout on the disk encryption keys
Change-Id: Ie66bea62ccc5d8066a12b9a7acf26dafa4b2eaa3
8 years ago
Paul Crowley
26335ed378
Use a longer timeout on the disk encryption keys
...
am: b3de337
* commit 'b3de337acd7ad07de1ed30d24fdfd628d1d8590b':
Use a longer timeout on the disk encryption keys
Change-Id: Ieadec9da13383361ac76bf6b79ecea948965a1d9
8 years ago
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
8 years ago
Android Build Merger (Role)
04c341b0eb
Merge "Merge "Unmount public sdcard filesystems before killing the fuse process." into nyc-dev am: a4330be
am: c1428a5" into nyc-mr1-dev-plus-aosp
8 years ago
John Cormie
206cac88f3
Merge "Unmount public sdcard filesystems before killing the fuse process." into nyc-dev am: a4330be
...
am: a54cd87
* commit 'a54cd8739c8d313b66354f99ed9419ccc3f6be10':
Unmount public sdcard filesystems before killing the fuse process.
Change-Id: I11813de6b10a9a98af823443332bb07b82cc1d06
8 years ago
John Cormie
5c0ed69d96
Merge "Unmount public sdcard filesystems before killing the fuse process." into nyc-dev am: a4330be
...
am: c1428a5
* commit 'c1428a51c3d343814e683e2e9864a5cfee6836a0':
Unmount public sdcard filesystems before killing the fuse process.
Change-Id: I0b24d5c73deb67764092f7934c72ec48937e5286
8 years ago
John Cormie
a54cd8739c
Merge "Unmount public sdcard filesystems before killing the fuse process." into nyc-dev
...
am: a4330be
* commit 'a4330beb482c3b5decf6a6fc966e5589210130eb':
Unmount public sdcard filesystems before killing the fuse process.
Change-Id: I294d46bb27fb6d8ac83f1041e849fd366134b6ee
8 years ago
John Cormie
c1428a51c3
Merge "Unmount public sdcard filesystems before killing the fuse process." into nyc-dev
...
am: a4330be
* commit 'a4330beb482c3b5decf6a6fc966e5589210130eb':
Unmount public sdcard filesystems before killing the fuse process.
Change-Id: If9f7acd5bc77ee4ecf9eed7375881b5554e85b9a
8 years ago
John Cormie
a4330beb48
Merge "Unmount public sdcard filesystems before killing the fuse process." into nyc-dev
8 years ago
Martijn Coenen
01eaa5c78a
Merge "Move vold (and sdcard childs) to foreground cpuset." into nyc-dev am: 47ff14a
...
am: 05f1d81
* commit '05f1d813cc2964339d3f606c52cd599cd378a530':
Change-Id: I289125919e8cffa06a400343d201583a6d550a5c
8 years ago
Martijn Coenen
689c11ea47
Merge "Move vold (and sdcard childs) to foreground cpuset." into nyc-dev am: 47ff14a
...
am: f56b110
* commit 'f56b1109197658e2da9c86d1ead93e52b3e01532':
Move vold (and sdcard childs) to foreground cpuset.
Change-Id: I69b5a07a0e5e5cc997ce5cfa36c154024537f490
8 years ago
Martijn Coenen
f56b110919
Merge "Move vold (and sdcard childs) to foreground cpuset." into nyc-dev
...
am: 47ff14a
* commit '47ff14ad38ec96fef25b2bbe1b3365fcd97bc8f5':
Move vold (and sdcard childs) to foreground cpuset.
Change-Id: Iad30255947ff204325736b361e883aaeaa31a473
8 years ago
Martijn Coenen
05f1d813cc
Merge "Move vold (and sdcard childs) to foreground cpuset." into nyc-dev
...
am: 47ff14a
* commit '47ff14ad38ec96fef25b2bbe1b3365fcd97bc8f5':
Move vold (and sdcard childs) to foreground cpuset.
Change-Id: I2d539472902f0f2ce33bbfe767f93b9bf91856ce
8 years ago
Martijn Coenen
47ff14ad38
Merge "Move vold (and sdcard childs) to foreground cpuset." into nyc-dev
8 years ago
John Cormie
25cc7e3c33
Unmount public sdcard filesystems before killing the fuse process.
...
Avoids ENOTCONN during eject for sdcard users.
Change-Id: I7b89ccaad4bb7af3639dc0b702168030a2f88366
Bug: 28268676
8 years ago
Paul Lawrence
6f136e8423
Merge "Don\'t start defaultcrypto twice" into nyc-dev am: 0264d8f
...
am: c771d20
* commit 'c771d2086043d7b7d665a18b003937b1e142b7f0':
Change-Id: Iabd62fdefbf3ea43833bc2fdb9364d51a5bba779
8 years ago
Paul Lawrence
85dfdb082d
Merge "Don\'t start defaultcrypto twice" into nyc-dev am: 0264d8f
...
am: e72c338
* commit 'e72c33872e2105ca1e63ba4f891ac68a6330dffa':
Don't start defaultcrypto twice
Change-Id: Ibad904c5df684b03b80771a6a90c6a1ee49e073f
8 years ago
Paul Lawrence
c771d20860
Merge "Don\'t start defaultcrypto twice" into nyc-dev
...
am: 0264d8f
* commit '0264d8ff7c2d5a2cdb4faaf9a3493103138373dd':
Don't start defaultcrypto twice
Change-Id: I39951628d41f656901658cd82a56298ef9f663ec
8 years ago
Paul Lawrence
e72c33872e
Merge "Don\'t start defaultcrypto twice" into nyc-dev
...
am: 0264d8f
* commit '0264d8ff7c2d5a2cdb4faaf9a3493103138373dd':
Don't start defaultcrypto twice
Change-Id: Ief95c3bf7798cf6090f68fb2eac124677d448187
8 years ago
Paul Lawrence
0264d8ff7c
Merge "Don't start defaultcrypto twice" into nyc-dev
8 years ago
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
8 years ago
Jeff Sharkey
e34f078ab1
Consistent creation/destruction of user data. am: be70c9a
...
am: c85be2f
* commit 'c85be2fc40ec7d7a70fee4b19325de21ff085724':
Change-Id: I93288ad9c962639dbfa63e33395f0ac3952b045b
8 years ago
Jeff Sharkey
0068f8e490
Consistent creation/destruction of user data. am: be70c9a
...
am: 30b0a1f
* commit '30b0a1fcdd2c7a60c104ffcd3dca4c9c2c1e682b':
Consistent creation/destruction of user data.
Change-Id: I72e91bbf15eaf91c72a61a26baf2e6908934958a
8 years ago
Jeff Sharkey
30b0a1fcdd
Consistent creation/destruction of user data.
...
am: be70c9a
* commit 'be70c9ae2251ac8f3bfbbe75146f8c533d64e01b':
Consistent creation/destruction of user data.
Change-Id: I55f4fe88a8c02d019fa92028e6ad358fc0f75aeb
8 years ago
Jeff Sharkey
c85be2fc40
Consistent creation/destruction of user data.
...
am: be70c9a
* commit 'be70c9ae2251ac8f3bfbbe75146f8c533d64e01b':
Consistent creation/destruction of user data.
Change-Id: Iddb906f6df0587faf95198446c376b2e8d550bec
8 years ago
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
8 years ago
Martijn Coenen
624ec66b26
Move vold (and sdcard childs) to foreground cpuset.
...
Bug: 24949295
Change-Id: I7118a374db90ede517a92f72763d624b9a234ea7
8 years ago
Elliott Hughes
ccd9dd53f8
resolve merge conflicts of 81fd991
to nyc-dev-plus-aosp
...
Change-Id: Iabda2c9ad05ed4aa0a078c5da40b887f36dd9328
8 years ago
Mattias Nissler
81fd991d8b
Merge "Switch to BoringSSL crypto."
...
am: af458c4
* commit 'af458c478a9f333fa39bdddb9a7aa097a2196b64':
Switch to BoringSSL crypto.
Change-Id: Ie3c9a05bfd05dfa9b1a79fe42b59d0dfb3346843
8 years ago
Elliott Hughes
af458c478a
Merge "Switch to BoringSSL crypto."
8 years ago
Dan Austin
8afff3bfe1
Merge "Address const issues in preparation for libcxx rebase." am: a4f7dad
...
am: 3cc69fa
* commit '3cc69faa6797ae0cfe43f4243d564fbe14f4cfe4':
Address const issues in preparation for libcxx rebase.
Change-Id: I58f814d71e5d5c067ade613d0bf8a88911d53424
8 years ago