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
John Cormie
c1e291d71b
Merge "Merge "Unmount public sdcard filesystems before killing the fuse process." into nyc-dev am: a4330be
am: c1428a5" into nyc-mr1-dev-plus-aosp
...
am: 04c341b
* commit '04c341b0ebd3e5519efd68f5bb38728ec0fe1520':
Change-Id: Ib7e296f8eb567d676ffaa482e2b3745477322fa7
8 years ago
John Cormie
2ee53ad16b
Merge "Unmount public sdcard filesystems before killing the fuse process." into nyc-dev am: a4330be
am: a54cd87
...
am: 206cac8
* commit '206cac88f3fed4030ea42598bf1e10e7ac8c2899':
Unmount public sdcard filesystems before killing the fuse process.
Change-Id: Iae6070abc68ce59f5cbb839cc55ce8fde8d70e3f
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
Daniel Rosenberg
5138d79e89
Merge "Fix resizeAsec to determine correct size"
8 years ago
Martijn Coenen
230fd19df6
Merge "Move vold (and sdcard childs) to foreground cpuset." into nyc-dev am: 47ff14a
am: 05f1d81
...
am: 01eaa5c
* commit '01eaa5c78a340d874b9f5a4e6cf4c5b5975f3563':
Change-Id: Iae56812fcc28604deca523c40140d0ea5eaa2e30
8 years ago
Martijn Coenen
973ccaf522
Merge "Move vold (and sdcard childs) to foreground cpuset." into nyc-dev am: 47ff14a
am: f56b110
...
am: 689c11e
* commit '689c11ea4741baaa36738b8e490b74badf898092':
Move vold (and sdcard childs) to foreground cpuset.
Change-Id: If8d4716b8dfe85f52cbbf19f7e39f38ef2110280
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
Daniel Rosenberg
e4c291a1ee
Fix resizeAsec to determine correct size
...
This fixes an eror where resizeAsec would attempt
to read from the superblock struct before initializing
it.
Bug: 28292918
Change-Id: Ic6804e97e7c83bcedfb682a187b8d5e0e1bc51f9
8 years ago
Greg Kaiser
e8167afe55
cryptfs: Avoid dereferencing null pointer
...
We already know that "intermediate_key" is non-NULL here. We
care if the result of the allocation, "*intermediate_key", is
non-NULL prior to our memcpy.
Change-Id: I83e22dfadabb870d527b93b31470bf47e22201bb
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
9247987e84
Merge "Don\'t start defaultcrypto twice" into nyc-dev am: 0264d8f
am: c771d20
...
am: 6f136e8
* commit '6f136e8423c9aeb34b5c2b4fcbc62deb76439976':
Change-Id: I95c13e47a67d0495f8a02b91f23d138dbf1c9892
8 years ago
Paul Lawrence
b451785495
Merge "Don\'t start defaultcrypto twice" into nyc-dev am: 0264d8f
am: e72c338
...
am: 85dfdb0
* commit '85dfdb082d87e2e17e69cc74d5b773959b15645c':
Don't start defaultcrypto twice
Change-Id: Ia3c7998a00bc96dfbb211bfdf733eb22708ad13a
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
ce63cbc774
Consistent creation/destruction of user data. am: be70c9a
am: c85be2f
...
am: e34f078
* commit 'e34f078ab1c39048851c339224bf5af01c2ebada':
Change-Id: Iffada0a86632ce9be14f0bce36b19aa4cd6da529
8 years ago
Jeff Sharkey
e480434c69
Consistent creation/destruction of user data. am: be70c9a
am: 30b0a1f
...
am: 0068f8e
* commit '0068f8e4907b82708822279dabf4710df3680beb':
Consistent creation/destruction of user data.
Change-Id: I74206efb6610e72151878f6c432980b0293bea0e
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
Mattias Nissler
7634807192
resolve merge conflicts of 81fd991
to nyc-dev-plus-aosp
...
am: ccd9dd5
* commit 'ccd9dd53f8a55b296eb0671acefc9f0163fd83b4':
Switch to BoringSSL crypto.
Change-Id: Icc997e054801181ab99cbd9a77cd209b93ec9cd3
8 years ago
Dan Austin
6a127c09a8
Merge "Address const issues in preparation for libcxx rebase." am: a4f7dad
am: 3cc69fa
...
am: 8afff3b
* commit '8afff3bfe18320cece8b5601478a34c313a5ad46':
Address const issues in preparation for libcxx rebase.
Change-Id: Ic64c71deda5f1ca154f2e3fd281500e7142eff6b
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
Dan Austin
3cc69faa67
Merge "Address const issues in preparation for libcxx rebase."
...
am: a4f7dad
* commit 'a4f7dadd389e25d2b5749d1edf65081b3a4e6961':
Address const issues in preparation for libcxx rebase.
Change-Id: I63c3a205db98d956c3c02a4f4f6fd87fd4e052e8
8 years ago
Dan Austin
a4f7dadd38
Merge "Address const issues in preparation for libcxx rebase."
8 years ago
Yabin Cui
baeb3b4816
Merge "vold: write bootloader message directly." into nyc-dev am: cbedcc3
...
am: 008c7dd
* commit '008c7ddb1fe7743f780801c1cf219a3c25445401':
vold: write bootloader message directly.
Change-Id: I10a098025619c4f32db3ce551a4b85e14a9558a8
8 years ago
Yabin Cui
008c7ddb1f
Merge "vold: write bootloader message directly." into nyc-dev
...
am: cbedcc3
* commit 'cbedcc30b32d79d77d89f23074da4dc76bf5e26d':
vold: write bootloader message directly.
Change-Id: Ib8f63a49a86c0e9e7a231cb5d22f6bb9a14e820f
8 years ago
Yabin Cui
cbedcc30b3
Merge "vold: write bootloader message directly." into nyc-dev
8 years ago
Daichi Hirono
cb141e1b6a
Add log flag for verbose AppFuse log for nyc-dev. am: 2d6555f
...
am: 4d5cfe5
* commit '4d5cfe57dd92ddfe8cf0ef78b096d669d7df6382':
Add log flag for verbose AppFuse log for nyc-dev.
Change-Id: Idb2d16d6c265b191bff44e9c10f23375699d0933
8 years ago
Daichi Hirono
4d5cfe57dd
Add log flag for verbose AppFuse log for nyc-dev.
...
am: 2d6555f
* commit '2d6555f33a5b0fd1e9f0db87e3a2146c3c26add0':
Add log flag for verbose AppFuse log for nyc-dev.
Change-Id: I8a2325c0dfd70888e635994f8aa5901fbf57efac
8 years ago