tequilaOS/platform_system_vold
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
1337 commits 1 branch 0 tags 9.7 MiB
Commit graph

1337 commits

This branch
This branch
All branches
Author SHA1 Message Date
Chih-Hung Hsieh
c81de6f84f Fix google-explicit-constructor warnings. 
Bug: 28341362
Change-Id: I30adc5ba8e977aa6626d12f0981fa580d1425a4e
 2016-04-29 14:42:01 -07:00
Paul Crowley
1b3489d1fd Use a longer timeout on the disk encryption keys am: b3de337 am: 26335ed 
am: 1cc3cc5

* commit '1cc3cc59f6d79b59064e1021975201f086fb356d':

Change-Id: Ide61c33fd6b4338e0d56fc03ca50c96e4bae4f59
 2016-04-28 01:49:40 +00:00
Paul Crowley
466450df09 Use a longer timeout on the disk encryption keys am: b3de337 am: 409c083 
am: 50da911

* commit '50da911fda64205677571d9cb1d668336cfb0f7f':
  Use a longer timeout on the disk encryption keys

Change-Id: I43279eb3a1bd92839c2d742acc95cb96c920b5dd
 2016-04-28 01:49:39 +00:00
Paul Crowley
1cc3cc59f6 Use a longer timeout on the disk encryption keys am: b3de337 
am: 26335ed

* commit '26335ed378cd31a9c31669db8756ec317efd2e97':

Change-Id: I784a3b84675fdff4b5d228c3bc5acf6b106f5ec7
 2016-04-28 00:20:07 +00:00
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
 2016-04-28 00:01:44 +00:00
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
 2016-04-27 23:45:26 +00:00
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
 2016-04-27 22:53:18 +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
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
 2016-04-26 16:39:00 +00:00
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
 2016-04-26 16:39:00 +00:00
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 2016-04-25 23:59:47 +00:00
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
 2016-04-25 23:59:38 +00:00
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
 2016-04-25 23:59:38 +00:00
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
 2016-04-25 23:57:06 +00:00
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
 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
Daniel Rosenberg
5138d79e89 Merge "Fix resizeAsec to determine correct size" 2016-04-25 20:46:25 +00:00
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
 2016-04-25 18:24:38 +00:00
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
 2016-04-25 18:24:37 +00:00
Martijn Coenen
01eaa5c78a Merge "Move vold (and sdcard childs) to foreground cpuset." into nyc-dev am: 47ff14a 
am: 05f1d81

* commit '05f1d813cc2964339d3f606c52cd599cd378a530':

Change-Id: I289125919e8cffa06a400343d201583a6d550a5c
 2016-04-25 18:19:28 +00:00
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
 2016-04-25 18:09:13 +00:00
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
 2016-04-25 18:03:49 +00:00
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
 2016-04-25 18:03:42 +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
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
 2016-04-20 14:16:19 -07:00
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
 2016-04-20 10:50:15 -07: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
9247987e84 Merge "Don\'t start defaultcrypto twice" into nyc-dev am: 0264d8f am: c771d20 
am: 6f136e8

* commit '6f136e8423c9aeb34b5c2b4fcbc62deb76439976':

Change-Id: I95c13e47a67d0495f8a02b91f23d138dbf1c9892
 2016-04-19 14:53:04 +00:00
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
 2016-04-19 14:53:04 +00:00
Paul Lawrence
6f136e8423 Merge "Don\'t start defaultcrypto twice" into nyc-dev am: 0264d8f 
am: c771d20

* commit 'c771d2086043d7b7d665a18b003937b1e142b7f0':

Change-Id: Iabd62fdefbf3ea43833bc2fdb9364d51a5bba779
 2016-04-19 14:52:42 +00:00
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
 2016-04-19 14:50:07 +00:00
Paul Lawrence
c771d20860 Merge "Don\'t start defaultcrypto twice" into nyc-dev 
am: 0264d8f

* commit '0264d8ff7c2d5a2cdb4faaf9a3493103138373dd':
  Don't start defaultcrypto twice

Change-Id: I39951628d41f656901658cd82a56298ef9f663ec
 2016-04-19 14:47:13 +00:00
Paul Lawrence
e72c33872e Merge "Don\'t start defaultcrypto twice" into nyc-dev 
am: 0264d8f

* commit '0264d8ff7c2d5a2cdb4faaf9a3493103138373dd':
  Don't start defaultcrypto twice

Change-Id: Ief95c3bf7798cf6090f68fb2eac124677d448187
 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
ce63cbc774 Consistent creation/destruction of user data. am: be70c9a am: c85be2f 
am: e34f078

* commit 'e34f078ab1c39048851c339224bf5af01c2ebada':

Change-Id: Iffada0a86632ce9be14f0bce36b19aa4cd6da529
 2016-04-18 20:18:35 +00:00
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
 2016-04-18 20:18:34 +00:00
Jeff Sharkey
e34f078ab1 Consistent creation/destruction of user data. am: be70c9a 
am: c85be2f

* commit 'c85be2fc40ec7d7a70fee4b19325de21ff085724':

Change-Id: I93288ad9c962639dbfa63e33395f0ac3952b045b
 2016-04-18 20:15:17 +00:00
Jeff Sharkey
0068f8e490 Consistent creation/destruction of user data. am: be70c9a 
am: 30b0a1f

* commit '30b0a1fcdd2c7a60c104ffcd3dca4c9c2c1e682b':
  Consistent creation/destruction of user data.

Change-Id: I72e91bbf15eaf91c72a61a26baf2e6908934958a
 2016-04-18 20:05:56 +00:00
Jeff Sharkey
30b0a1fcdd Consistent creation/destruction of user data. 
am: be70c9a

* commit 'be70c9ae2251ac8f3bfbbe75146f8c533d64e01b':
  Consistent creation/destruction of user data.

Change-Id: I55f4fe88a8c02d019fa92028e6ad358fc0f75aeb
 2016-04-18 19:59:55 +00:00
Jeff Sharkey
c85be2fc40 Consistent creation/destruction of user data. 
am: be70c9a

* commit 'be70c9ae2251ac8f3bfbbe75146f8c533d64e01b':
  Consistent creation/destruction of user data.

Change-Id: Iddb906f6df0587faf95198446c376b2e8d550bec
 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
Mattias Nissler
7634807192 resolve merge conflicts of 81fd991 to nyc-dev-plus-aosp 
am: ccd9dd5

* commit 'ccd9dd53f8a55b296eb0671acefc9f0163fd83b4':
  Switch to BoringSSL crypto.

Change-Id: Icc997e054801181ab99cbd9a77cd209b93ec9cd3
 2016-04-13 01:56:49 +00:00
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
 2016-04-13 01:56:49 +00: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

* commit 'af458c478a9f333fa39bdddb9a7aa097a2196b64':
  Switch to BoringSSL crypto.

Change-Id: Ie3c9a05bfd05dfa9b1a79fe42b59d0dfb3346843
 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

* commit '3cc69faa6797ae0cfe43f4243d564fbe14f4cfe4':
  Address const issues in preparation for libcxx rebase.

Change-Id: I58f814d71e5d5c067ade613d0bf8a88911d53424
 2016-04-12 22:35:50 +00:00
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
 2016-04-12 22:33:13 +00:00