summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Validate asec names.HEADmasterNick Kralevich2015-12-062-0/+99
* vold: Add NTFS read+write support via ntfs-3gSteve Kondik2013-07-072-28/+78
* vold: exFAT supportSteve Kondik2013-07-074-0/+209
* vold: add support for ext4 mediacodeworkx2013-03-045-6/+209
* vold: use blkid to detect filesystem typecodeworkx2013-03-032-31/+63
* Merge tag 'android-4.2.2_r1' of https://android.googlesource.com/platform/sys...Steve Kondik2013-02-121-0/+4
|\
| * Fix issue #7503920: Log spew from voldDianne Hackborn2012-11-271-0/+4
| *-. Reconcile with jb-mr1-factory-release jb-mr1-release - do not mergeThe Android Open Source Project2012-11-060-0/+0
| |\ \
* | | | vold: do not try and unmount asec when unmounting non-primary storagePawit Pornkitprasan2012-11-231-17/+20
* | | | Merge branch 'jb-mr1-release' of https://android.googlesource.com/platform/sy...Steve Kondik2012-11-185-48/+70
|\ \ \ \ | | |_|/ | |/| |
| * | | merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-10-180-0/+0
| |\ \ \ | | |/ / | |/| / | | |/
| | * Fix encryption on certain devicesKen Sumrall2012-10-091-0/+3
| | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-10-070-0/+0
| | |\
| | | * Update environment variable for multi-user.Jeff Sharkey2012-10-011-1/+1
| | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-09-300-0/+0
| | | |\
| | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-09-260-0/+0
| | | | |\
| | | | | * Unmount external storage on multi-user devices.Jeff Sharkey2012-08-231-5/+8
| * | | | | Another fix for encryptionKen Sumrall2012-10-171-2/+13
| * | | | | Fix encryption on certain devicesKen Sumrall2012-10-091-0/+3
| |/ / / /
| * | | | Unmount in-place instead of using MS_MOVE.Jeff Sharkey2012-10-041-22/+10
| * | | | Update environment variable for multi-user.Jeff Sharkey2012-10-011-1/+1
| |/ / /
| * / / Workaround a kernel race when loading dmcrypt tableKen Sumrall2012-09-291-1/+13
| |/ /
| * | Handle multi-user mountObb() requests.Jeff Sharkey2012-09-252-3/+3
| * | Unmount external storage on multi-user devices.Jeff Sharkey2012-08-231-5/+8
| * | am 7c5109be: (-s ours) Reconcile with jb-mr0-release - do not mergeThe Android Open Source Project2012-08-160-0/+0
| |\ \ | | |/ | |/|
| | * Reconcile with jb-mr0-release - do not mergeThe Android Open Source Project2012-08-160-0/+0
| | |\
| * | | am 62224a32: (-s ours) am eacf7e03: Only cleanup ASECs in external storage DO...Kenny Root2012-08-130-0/+0
| |\| |
| | * | am eacf7e03: Only cleanup ASECs in external storage DO NOT MERGEKenny Root2012-08-132-13/+38
| | |\ \
| * | | | Only cleanup ASECs in external storageKenny Root2012-08-092-13/+38
| * | | | Merge "Fix a typo in cryptfs.c"Ken Sumrall2012-06-281-1/+1
| |\ \ \ \
| | * | | | Fix a typo in cryptfs.cKen Sumrall2012-06-271-1/+1
| * | | | | Add mode when open(O_CREAT) is used.Nick Kralevich2012-06-261-1/+1
| * | | | | am 9ee8a315: Reconcile with jb-releaseThe Android Open Source Project2012-06-190-0/+0
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Reconcile with jb-releaseThe Android Open Source Project2012-06-190-0/+0
| | |\ \ \ \
| * | | | | | am a7926050: am 425524db: Unmount all asec apps before encryptingKen Sumrall2012-06-183-0/+66
| |\| | | | |
| | * | | | | am 425524db: Unmount all asec apps before encryptingKen Sumrall2012-06-183-0/+66
| | |\ \ \ \ \
| * | | | | | | am e925ff66: am bac5eb96: Merge "Delay disk inserted broadcast until disk is ...Jean-Baptiste Queru2012-05-221-7/+10
| |\| | | | | |
| | * | | | | | am bac5eb96: Merge "Delay disk inserted broadcast until disk is ready"Jean-Baptiste Queru2012-05-221-7/+10
| | |\ \ \ \ \ \
| | | * \ \ \ \ \ Merge "Delay disk inserted broadcast until disk is ready"Jean-Baptiste Queru2012-05-221-7/+10
| | | |\ \ \ \ \ \
| | | | * | | | | | Delay disk inserted broadcast until disk is readyMagnus Malmborn2012-05-071-7/+10
| * | | | | | | | | am 2fdea0aa: Reconcile with jb-release nakasi-factoryrom-releaseThe Android Open Source Project2012-05-160-0/+0
| |\| | | | | | | |
| | | \ \ \ \ \ \ \
| | | \ \ \ \ \ \ \
| | *-. | | | | | | | Reconcile with jb-release nakasi-factoryrom-releaseThe Android Open Source Project2012-05-160-0/+0
| | |\ \| | | | | | |
| * | | | | | | | | | am 760cec44: am 41836711: Merge "Sleep to wait for dm to create node" into jb...Kenny Root2012-05-101-0/+13
| |\| | | | | | | | |
| | * | | | | | | | | am 41836711: Merge "Sleep to wait for dm to create node" into jb-devKenny Root2012-05-101-0/+13
| | |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | | am 9688165c: am 1a673c86: Native library loading needs to read directoryKenny Root2012-05-101-1/+1
| |\| | | | | | | | | |
| | * | | | | | | | | | am 1a673c86: Native library loading needs to read directoryKenny Root2012-05-101-1/+1
| | |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | am 457197c5: am 348c8aba: Only set permissions on dirs or filesKenny Root2012-05-101-1/+1
| |\| | | | | | | | | | |
| | * | | | | | | | | | | am 348c8aba: Only set permissions on dirs or filesKenny Root2012-05-101-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | am 0e110bb5: am 5cf6325c: Merge "Unshare ums when SD card is removed"Jean-Baptiste Queru2012-05-081-0/+5
| |\| | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | |
| | * | | | | | | | | | | am 5cf6325c: Merge "Unshare ums when SD card is removed"Jean-Baptiste Queru2012-05-081-0/+5
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / / / / | | | |/| | | | | | | | |