summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Validate asec names.HEADmasterNick Kralevich2015-12-062-0/+99
| | | | | | | | | | | | | Make sure asec names only contain alphanumeric, underscores, dots, or dashes. Don't allow double dots. Bug: 12504045 (cherry picked from commit 669626096513cf741646cf18a9e8ba246d359596) Change-Id: Ia9d04f373aa95878b2e81584c4167dc2d4aa0c78 Tested-by: Moritz Bandemer <replicant@posteo.mx>
* vold: Add NTFS read+write support via ntfs-3gSteve Kondik2013-07-072-28/+78
| | | | | | | * Use ntfs-3g for full NTFS support. * Original code from Freescale. Change-Id: I01191c3c339421904dc9415eb00143f7f8365152
* vold: exFAT supportSteve Kondik2013-07-074-0/+209
| | | | | | * Add support for exFAT using FUSE implementation. Change-Id: I590c7b1bc8fbcb8c0b2c669f4073ac022857e4da
* vold: add support for ext4 mediacodeworkx2013-03-045-6/+209
| | | | | | | | | | | Depends on: http://review.cyanogenmod.org/31202 http://review.cyanogenmod.org/31211 Result: http://pastebin.com/nzUbvW7K Change-Id: I5bd227e637f2a1ed4d13a2eb81390c56c953f482
* vold: use blkid to detect filesystem typecodeworkx2013-03-032-31/+63
| | | | | | In preparation for handling ext4 partitions via vold and fuse. Change-Id: Ibaccded63a7a293ad53f16afb80448ddd493554c
* Merge tag 'android-4.2.2_r1' of ↵Steve Kondik2013-02-121-0/+4
|\ | | | | | | | | | | https://android.googlesource.com/platform/system/vold into 1.1 Android 4.2.2 release 1
| * Fix issue #7503920: Log spew from voldDianne Hackborn2012-11-271-0/+4
| | | | | | | | Change-Id: Ibfa5b979014f433085b94aab0d3d81bf9269d4b5
| *-. Reconcile with jb-mr1-factory-release jb-mr1-release - do not mergeThe Android Open Source Project2012-11-060-0/+0
| |\ \ | | | | | | | | | | | | Change-Id: I8de173f6b24b2f82b20e568e577878d8539e5148
* | | | vold: do not try and unmount asec when unmounting non-primary storagePawit Pornkitprasan2012-11-231-17/+20
| | | | | | | | | | | | | | | | | | | | | | | | patch was lost in the merge Change-Id: I9de6c2dc99c1484ac86fec7ee94eea5977a4aa11
* | | | Merge branch 'jb-mr1-release' of ↵Steve Kondik2012-11-185-48/+70
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | https://android.googlesource.com/platform/system/vold into mr1 Conflicts: Volume.cpp Change-Id: I0b28a56ac2edf1807ee21d23058bcfc5b4bb7724
| * | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is a race in the encryption code that after it accepts the decryption password, it tells init to kill all the processes in class "main", then it mounts the decrypted filesystem, preps it, and restarts the framework. For an unknown reason on some devices, the new framework sometimes starts up before init has killed and reaped all the old processes. The proper fix is to make the killing of the old framework synchronous, so vold waits till all the processes have died. But with factory rom a few days away, the much more pragmatic solution of adding a sleep of 1 second after telling init to kill the old framework will suffice. Bug: 7271212 Change-Id: Ie971cd04abbc6f3f6500b4acd79d3b3b26d9561c
| | * 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
| | | | | | | | | | | | | | | | | | | | Bug: 7260040 Change-Id: I96d821e11a3f0be32bfe92a4151f00f2b15d100e
| | | * 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 7044670 Change-Id: If1f99968b0392cae9420d067c75bfc18d1067b2c
| * | | | | Another fix for encryptionKen Sumrall2012-10-171-2/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The previous problem of the framework not properly restarting after accepting the password to decrypt the storage is also a problem when restarting the framework to display the encryption progress screen. So like the previous hacky fix, add a sleep to wait a few moments before proceeding. Also, increase the sleep of the previous fix from 1 second to 2, as the problem was seen once more in testing. A proper fix has been designed and hopefully will work and be checked-in RSN. Change-Id: Icc2c072ce7f7ebcdea22cd7ff8cb2b87a627c578
| * | | | | Fix encryption on certain devicesKen Sumrall2012-10-091-0/+3
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is a race in the encryption code that after it accepts the decryption password, it tells init to kill all the processes in class "main", then it mounts the decrypted filesystem, preps it, and restarts the framework. For an unknown reason on some devices, the new framework sometimes starts up before init has killed and reaped all the old processes. The proper fix is to make the killing of the old framework synchronous, so vold waits till all the processes have died. But with factory rom a few days away, the much more pragmatic solution of adding a sleep of 1 second after telling init to kill the old framework will suffice. Bug: 7271212 Change-Id: Ie971cd04abbc6f3f6500b4acd79d3b3b26d9561c
| * | | | Unmount in-place instead of using MS_MOVE.Jeff Sharkey2012-10-041-22/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To support multi-user emulated storage, we mount rootfs as MS_SHARED, which means we can't MS_MOVE existing mount points rooted in the shared subtree. Initial staging is still able to MS_MOVE, since it's rooted in a MS_PRIVATE tmpfs rooted at /mnt/secure. This change fixes unmounting by operating in-place instead of trying (and failing) to MS_MOVE back to staging. Bug: 7127564 Change-Id: I4783db4319b61c0915da39361cbc7e8f4943d094
| * | | | Update environment variable for multi-user.Jeff Sharkey2012-10-011-1/+1
| |/ / / | | | | | | | | | | | | | | | | Bug: 7260040 Change-Id: I96d821e11a3f0be32bfe92a4151f00f2b15d100e
| * | | Workaround a kernel race when loading dmcrypt tableKen Sumrall2012-09-291-1/+13
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The kernel seems to return from umount(2) sometimes before it has released the underlying block device. So until the kernel is fixed, try up to 10 times to load the crypto mapping table, waiting 500 ms between tries. bug: 7220345 Change-Id: Iad3bbef37cbe2e01613bb8a8c4886babdecb8328
| * | Handle multi-user mountObb() requests.Jeff Sharkey2012-09-252-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | Mount OBB containers using shared app GID, so that an app can read the mount point across users. Bug: 7212801 Change-Id: Ia1be52df9854c259b20728111f3a2c9facf4beaa
| * | Unmount external storage on multi-user devices.Jeff Sharkey2012-08-231-5/+8
| | | | | | | | | | | | | | | Bug: 7044670 Change-Id: If1f99968b0392cae9420d067c75bfc18d1067b2c
| * | am 7c5109be: (-s ours) Reconcile with jb-mr0-release - do not mergeThe Android Open Source Project2012-08-160-0/+0
| |\ \ | | |/ | |/| | | | * commit '7c5109bef8c1f8b857b043bf9c1d26c2f0556e8f':
| | * Reconcile with jb-mr0-release - do not mergeThe Android Open Source Project2012-08-160-0/+0
| | |\ | | | | | | | | | | | | Change-Id: I3ec7be5d1d08566f120f18b68d2f691f92f006c8
| * | \ am 62224a32: (-s ours) am eacf7e03: Only cleanup ASECs in external storage ↵Kenny Root2012-08-130-0/+0
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | DO NOT MERGE * commit '62224a32f00c344c8ba6edab2107c833700e26a8': Only cleanup ASECs in external storage DO NOT MERGE
| | * | am eacf7e03: Only cleanup ASECs in external storage DO NOT MERGEKenny Root2012-08-132-13/+38
| | |\ \ | | | | | | | | | | | | | | | | | | | | * commit 'eacf7e03d60a2b33ac6cdaa0e01bd6a6fdd9455a': Only cleanup ASECs in external storage DO NOT MERGE
| * | | | Only cleanup ASECs in external storageKenny Root2012-08-092-13/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Any ASEC or OBB files were unmounted when USB storage was set to UMS mode. This changes it so only ASEC files on external storage and OBB files mounted from external storage are unmounted. Bug: 6948035 Change-Id: I91bc09ee5b792970b0eef895f6886f3ffad00e8f
| * | | | Merge "Fix a typo in cryptfs.c"Ken Sumrall2012-06-281-1/+1
| |\ \ \ \
| | * | | | Fix a typo in cryptfs.cKen Sumrall2012-06-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If629fa996b135e432bc89da7518b0c1f02750b45
| * | | | | Add mode when open(O_CREAT) is used.Nick Kralevich2012-06-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When creating a new file using open(..., O_CREAT), it is an error to fail to specify a creation mode. If a mode is not specified, a random stack provided value is used as the "mode". This will become a compile error in a future Android change. Change-Id: I761708c001247d7a2faac2e286288b45bfecc6f7
| * | | | | am 9ee8a315: Reconcile with jb-releaseThe Android Open Source Project2012-06-190-0/+0
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | * commit '9ee8a315eefde7e6ad1bc07bc9d50528f548e8e8': Unmount all asec apps before encrypting
| | * | | | Reconcile with jb-releaseThe Android Open Source Project2012-06-190-0/+0
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Change-Id: I60294fb5c41ef34eccc322889168497d9449c6ea
| * | \ \ \ \ am a7926050: am 425524db: Unmount all asec apps before encryptingKen Sumrall2012-06-183-0/+66
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | * commit 'a79260500a869f867118a6e5289c6e5a0353558f': Unmount all asec apps before encrypting
| | * | | | | am 425524db: Unmount all asec apps before encryptingKen Sumrall2012-06-183-0/+66
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '425524dba1552ab3d2ad39e205e65d0a2af997f2': Unmount all asec apps before encrypting
| * | \ \ \ \ \ am e925ff66: am bac5eb96: Merge "Delay disk inserted broadcast until disk is ↵Jean-Baptiste Queru2012-05-221-7/+10
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ready" * commit 'e925ff6670bb9cef9118ddceb2e3bff81833bd09': Delay disk inserted broadcast until disk is ready
| | * | | | | | am bac5eb96: Merge "Delay disk inserted broadcast until disk is ready"Jean-Baptiste Queru2012-05-221-7/+10
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'bac5eb966c5c3aa9abe83cdb5187326f422741ab': Delay disk inserted broadcast until disk is ready
| | | * \ \ \ \ \ 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Delay sending of "VolumeDiskInserted" broadcast until the disk is ready (ie until all the partitions have been received from kernel). This solves a race with MountService, otherwise there is a risk that MountService tries to mount the SD-card before the partition(s) have been received and the card will fail to mount. Change-Id: Ie2a28227ae9a7d6fe9106fb6875f469a0e899014
| * | | | | | | | | am 2fdea0aa: Reconcile with jb-release nakasi-factoryrom-releaseThe Android Open Source Project2012-05-160-0/+0
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '2fdea0aa78cefce50c6f51be97084977f2a6ae69': Native library loading needs to read directory Only set permissions on dirs or files Fix truncation of ASEC ids
| | | | | | | | | |
| | | \ \ \ \ \ \ \
| | *-. \ \ \ \ \ \ \ Reconcile with jb-release nakasi-factoryrom-releaseThe Android Open Source Project2012-05-160-0/+0
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | Change-Id: I2bc2763dc285edb9aa8bd9bedd068ee4483a3ce5
| * | | | | | | | | | am 760cec44: am 41836711: Merge "Sleep to wait for dm to create node" into ↵Kenny Root2012-05-101-0/+13
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jb-dev * commit '760cec444b0f3c8a243d100cd5f5520af7531d17': Sleep to wait for dm to create node
| | * | | | | | | | | am 41836711: Merge "Sleep to wait for dm to create node" into jb-devKenny Root2012-05-101-0/+13
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '418367112c96f6ce45aa142d613a575046b7f65f': Sleep to wait for dm to create node
| * | \ \ \ \ \ \ \ \ \ am 9688165c: am 1a673c86: Native library loading needs to read directoryKenny Root2012-05-101-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '9688165c81a1ab4c2ce08fc831030eebcf2ecc6f': Native library loading needs to read directory
| | * | | | | | | | | | am 1a673c86: Native library loading needs to read directoryKenny Root2012-05-101-1/+1
| | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '1a673c868c2d2d81fcaeab34b4a7c75d4a978584': Native library loading needs to read directory
| * | \ \ \ \ \ \ \ \ \ \ am 457197c5: am 348c8aba: Only set permissions on dirs or filesKenny Root2012-05-101-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '457197c50056216c1552e020998274a3bb249dd9': Only set permissions on dirs or files
| | * | | | | | | | | | | am 348c8aba: Only set permissions on dirs or filesKenny Root2012-05-101-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '348c8aba0d2df2996e0fe57900ef518c6aeb4b29': Only set permissions on dirs or files
| * | \ \ \ \ \ \ \ \ \ \ \ am 0e110bb5: am 5cf6325c: Merge "Unshare ums when SD card is removed"Jean-Baptiste Queru2012-05-081-0/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | | | | | | | | | | | / / / | | |_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | * commit '0e110bb5a2559b60003effa0e0bf460993e634a6': Unshare ums when SD card is removed
| | * | | | | | | | | | | am 5cf6325c: Merge "Unshare ums when SD card is removed"Jean-Baptiste Queru2012-05-081-0/+5
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '5cf6325c91792dbb1bb08fa1958c1fc8a5b9c45d': Unshare ums when SD card is removed