summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'cm-11.0' into stable/cm-11.0cm-11.0-XNPH05Q-tomato-9828f8e9cccm-11.0-XNPH05Q-bacon-5229c4ef56stable/cm-11.0-XNF9Xstable/cm-11.0-XNF8Ystable/cm-11.0shipping/cm-11.0Brint E. Kriebel2014-11-031-0/+11
|\
| * f2fs: disable fsck checkarter972014-09-131-0/+11
* | Merge branch 'cm-11.0' into stable/cm-11.0Brint E. Kriebel2014-10-014-1/+206
|\|
| * Add Flash-Friendly File System (f2fs) support.Evan McClain2014-09-104-1/+206
* | Merge branch 'cm-11.0' into stable/cm-11.0cm-11.0-XNPH44S-bacon-5fa8c79c0bBrint E. Kriebel2014-07-271-18/+18
|\|
| * vold: Support for moving crypto metadataSteve Kondik2014-07-242-7/+79
| * Create disk encryption key before framework startDinesh K Garg2014-07-031-18/+18
* | vold: Support for moving crypto metadataSteve Kondik2014-07-252-7/+79
|/
* vold: Send UUID with list responsecm-11.0-XNPH33R-bacon-3628510d76cm-11.0-XNPH30O-bacon-4f280f505aTom Marshall2014-06-191-2/+8
* Merge tag 'android-4.4.3_r1' into HEADRicardo Cerqueira2014-06-030-0/+0
|\
| * am 7cf05b15: am 2f0a1d66: am 7f6932df: am 35ab6119: am 3e03bf8a: am fd2dcf90:...Nick Kralevich2014-01-282-0/+99
| |\
| | * am 2f0a1d66: am 7f6932df: am 35ab6119: am 3e03bf8a: am fd2dcf90: am f4770dcf:...Nick Kralevich2014-01-272-0/+99
| | |\
| | | * am 7f6932df: am 35ab6119: am 3e03bf8a: am fd2dcf90: am f4770dcf: am 0de7c611:...Nick Kralevich2014-01-272-0/+99
| | | |\
| | | | * am 35ab6119: am 3e03bf8a: am fd2dcf90: am f4770dcf: am 0de7c611: Validate ase...Nick Kralevich2014-01-272-0/+99
| | | | |\
| | | | | * am 3e03bf8a: am fd2dcf90: am f4770dcf: am 0de7c611: Validate asec names.Nick Kralevich2014-01-272-0/+99
| | | | | |\
| | | | | | * am fd2dcf90: am f4770dcf: am 0de7c611: Validate asec names.Nick Kralevich2014-01-272-0/+99
| | | | | | |\
| | | | | | | * am f4770dcf: am 0de7c611: Validate asec names.Nick Kralevich2014-01-272-0/+99
| | | | | | | |\
| | | | | | | | * am 0de7c611: Validate asec names.Nick Kralevich2014-01-272-0/+99
| | | | | | | | |\
| | | | | | | | | * Validate asec names.Nick Kralevich2014-01-272-0/+99
* | | | | | | | | | Merge "vold: Honor mount options for ext4 mounts" into cm-11.0cm-11.0-XNPH25R-bacon-d22b777afacm-11.0-XNPH22R-bacon-03d77315eaRicardo Cerqueira2014-05-074-5/+14
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | vold: Honor mount options for ext4 mountsTom Marshall2014-05-024-5/+14
* | | | | | | | | | | Validate asec names.Nick Kralevich2014-05-052-0/+99
|/ / / / / / / / / /
* | | | | | | | | | Add missing head sys/types.h to Volume.hsndnvaps2014-04-091-1/+1
* | | | | | | | | | Adding support of dm-req-cryptDinesh K Garg2014-03-302-3/+40
* | | | | | | | | | Avoid segv by checking argc in "storage user <mountpoint>"JP Abgrall2014-03-211-0/+4
* | | | | | | | | | Convert all selinux_android_restorecon and _setfilecon calls to new API.Stephen Smalley2014-03-211-1/+1
* | | | | | | | | | Add SELinux restorecon calls on ASEC containers.Robert Craig2014-03-212-1/+10
* | | | | | | | | | Volume: Don't crap out when dealing with unformatted cardsRicardo Cerqueira2014-03-071-2/+11
* | | | | | | | | | Do not show disk errors if they are expected.Flamefire2014-01-283-4/+13
* | | | | | | | | | vold: Clean up warningsSteve Kondik2014-01-179-43/+8
* | | | | | | | | | vold: Allow specifying the filesystem type when formattingSteve Kondik2013-12-308-28/+82
* | | | | | | | | | vold: don't crash when formatting unformatted volumePawit Pornkitprasan2013-12-141-1/+6
* | | | | | | | | | Merge tag 'android-4.4.1_r1' into HEADRicardo Cerqueira2013-12-067-39/+156
|\| | | | | | | | |
| * | | | | | | | | vold: cryptfs: Don't update KDF without validating pwd/key.JP Abgrall2013-11-151-17/+25
| * | | | | | | | | Handle missing UUID/LABEL from blkid.Jeff Sharkey2013-11-111-4/+4
| * | | | | | | | | Use correct minor device number to format SD cardBlair Prescott2013-10-251-1/+3
| * | | | | | | | | Merge "Clean up ASEC unmounting on physical storage." into klp-devJeff Sharkey2013-10-184-14/+37
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Clean up ASEC unmounting on physical storage.Jeff Sharkey2013-10-174-14/+37
| * | | | | | | | | | Merge "Extract UUID and label from inserted volumes." into klp-devJeff Sharkey2013-10-184-25/+118
| |\| | | | | | | | |
| | * | | | | | | | | Extract UUID and label from inserted volumes.Jeff Sharkey2013-10-174-25/+118
| * | | | | | | | | | Merge "DO NOT MERGE. Fix crash in vold" into klp-devJeff Sharkey2013-10-171-1/+1
| |\| | | | | | | | |
| | * | | | | | | | | DO NOT MERGE. Fix crash in voldMarco Nelissen2013-10-161-1/+1
| * | | | | | | | | | merge in klp-release (no-op)Ed Heyl2013-10-160-0/+0
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | vold: Initialize flag variablesEthan Chen2013-12-031-0/+3
* | | | | | | | | | | vold: Raise MAX_PARTITIONS to 32Steve Kondik2013-11-271-1/+1
* | | | | | | | | | | vold: pass selinux context to ext4 mount (remount ro)Jorge Ruesga2013-11-271-1/+1
* | | | | | | | | | | Merge tag 'android-4.4_r1.2' into cm-11.0Ricardo Cerqueira2013-11-201-17/+25
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | vold: cryptfs: Don't update KDF without validating pwd/key.JP Abgrall2013-11-151-17/+25
| * | | | | | | | | | | merge in klp-release history after reset to klp-devThe Android Automerger2013-11-150-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / | |/| | | | | | | | | |
| | * | | | | | | | | | vold: cryptfs: Don't update KDF without validating pwd/key.JP Abgrall2013-11-151-17/+25
| |/ / / / / / / / / /