OSDN Git Service

resolve merge conflicts of 4ad7784 to stage-aosp-master
[android-x86/system-vold.git] / Disk.cpp
2017-06-28 Paul Crowleyresolve merge conflicts of 4ad7784 to stage-aosp-master
2017-06-16 Tom CherryMerge "Use WaitForProperty() to wait for restorecon...
2017-06-09 Chih-Hung HsiehMerge "Add OWNERS in system/vold" am: f18a5aad56
2017-05-19 Elliott HughesMerge "vold should #include <sys/sysmacros.h>" am:...
2017-05-19 Elliott HughesMerge "vold should #include <sys/sysmacros.h>" am:...
2017-05-19 Elliott HughesMerge "vold should #include <sys/sysmacros.h>"
2017-05-19 Treehugger RobotMerge "vold should #include <sys/sysmacros.h>"
2017-05-18 Elliott Hughesvold should #include <sys/sysmacros.h>
2017-05-13 Elliott HughesMerge "Switch to libkeyutils." am: 612eea6b4f am: 7a7df...
2017-05-03 Tom CherryMerge "BuildDataUserCePath always use dir instead of...
2017-04-05 Seigo NonakaMerge "Prepare necessary data directory before loading...
2017-03-31 Tom CherryMerge "vdc: use libbase logging and log directly to...
2017-03-27 Jeff SharkeyMerge "Add a new "virtual disk" feature."
2017-03-26 Jeff SharkeyAdd a new "virtual disk" feature.
2017-01-24 Dimitry IvanovFix deadlock between vold and init
2016-12-03 The Android AutomergerManually merge commit 'b406ffa' into stage-aosp-master
2016-10-28 Paul CrowleyMerge "Remove misleading comment (b/26948053)"
2016-10-20 Rahul ChaudhryMerge "system/vold: cleanup compiler warnings (read...
2016-10-18 Tao BaoMerge "Use libbootloader_message."
2016-10-10 Tao BaoMerge "Update the header path for ext4_utils." am:...
2016-09-24 Andreas GampeMerge "Vold: remove unused define" am: 7ac97f8e37 am...
2016-09-22 Dan AlbertMerge "Add missing include." am: 45b09e9144 am: 2ab88f0a77
2016-09-07 Wei WangUpdate fs_mgr_mount_all function am: 84c985e275
2016-09-06 Wei WangMerge "Update fs_mgr_mount_all function" am: 1d58bcf6d4...
2016-08-31 Jeff SharkeyDO NOT MERGE. Block adoptable storage when using FBE...
2016-08-31 Jeff SharkeyDO NOT MERGE. Block adoptable storage when using FBE.
2016-08-31 Jeff SharkeyDO NOT MERGE. Block adoptable storage when using FBE.
2016-08-23 TreeHugger RobotMerge "Blocking mode for debugging purposes."
2016-08-23 Jeff SharkeyBlock adoptable storage when using FBE.
2016-08-02 Chih-Hung HsiehMerge "Fix google-explicit-constructor warnings in...
2016-07-28 Chih-hung HsiehMerge \\\\"Fix clang-tidy performance warnings in syste...
2016-07-28 Chih-Hung HsiehMerge \\\"Fix clang-tidy performance warnings in system...
2016-07-27 Chih-hung HsiehMerge \\"Fix clang-tidy performance warnings in system...
2016-07-27 Chih-Hung HsiehMerge \"Fix clang-tidy performance warnings in system...
2016-07-27 Chih-hung HsiehMerge "Fix clang-tidy performance warnings in system...
2016-07-27 Chih-Hung HsiehFix clang-tidy performance warnings in system/vold.
2016-06-22 Chih-Hung HsiehMerge \"Fix misc-macro-parentheses warnings in system...
2016-05-11 Chih-Hung HsiehMerge "Fix misc-macro-parentheses warnings." am: 0c0f9228cf
2016-04-12 Elliott Hughesresolve merge conflicts of 81fd991 to nyc-dev-plus...
2016-04-12 Dan AustinMerge "Address const issues in preparation for libcxx...
2016-03-11 Hidehiko AbeMerge "Split slave-bind mount into two."
2016-03-11 Paul LawrenceMerge "Make sure encryption type is set on first boot...
2016-03-11 Jeff SharkeyMerge "Print size as unsigned when sending to framework...
2016-03-11 Jeff SharkeyMerge "Print size as unsigned when sending to framework...
2016-03-11 Jeff SharkeyMerge "Print size as unsigned when sending to framework...
2016-03-10 Jeff SharkeyPrint size as unsigned when sending to framework.
2016-03-10 Yu NingMerge "Support emulator\'s virtio-blk based SD card...
2016-03-10 Yu NingMerge "Support emulator\'s virtio-blk based SD card...
2016-03-10 Prathmesh PrabhuMerge "Support emulator's virtio-blk based SD card...
2016-03-08 Yu NingSupport emulator's virtio-blk based SD card
2015-12-05 Elliott Hughesresolve merge conflicts of b7d5a47cec to master.
2015-12-05 Elliott HughesMerge "Track rename from base/ to android-base/." am...
2015-12-05 Elliott HughesMerge "Track rename from base/ to android-base/."
2015-12-05 Elliott HughesMerge "Track rename from base/ to android-base/."
2015-12-04 Elliott HughesTrack rename from base/ to android-base/.
2015-12-03 Jeff SharkeyMerge "Handle non-format partition in Vold"
2015-12-03 Jeff SharkeyMerge "Make sure path is not NULL to avoid fatal except...
2015-12-03 Jeff SharkeyMerge "vold: fix 64 bit ioctl error"
2015-11-06 Kenny RootMerge "system/vold: check return value of PKCS5_PBKDF2_...
2015-11-03 Bill YiMerge commit 'aebfa6e7eee173b8e02f869c3a25cfe2a5fffb9b...
2015-10-29 Elliott HughesMerge "Fix ioctl parameter" am: 0eaad8ce8c
2015-10-21 Jeff SharkeyMerge "Promote free bytes calculation to 64 bits" am...
2015-10-21 Paul LawrenceMerge "Don't show UI on default encryption" into mnc...
2015-10-12 Jeff Sharkeyam f6852593: am cb42a40a: Merge "Clean up any/all stale...
2015-10-12 Jeff Sharkeyam cb42a40a: Merge "Clean up any/all stale partition...
2015-10-12 Jeff SharkeyMerge "Clean up any/all stale partition tables." into...
2015-10-02 Sami Tolvanenam 685dfdd3: Merge "Error correction: Add libfec depend...
2015-09-23 Jeff SharkeyClean up any/all stale partition tables.
2015-08-21 Tom Cherryam 218f48d6: Merge "bundle init.rc contents with its...
2015-08-21 Tom Cherryam 218f48d6: Merge "bundle init.rc contents with its...
2015-08-17 Elliott Hughesam f298f6be: Merge "Use errno correctly."
2015-08-17 Elliott Hughesam f298f6be: Merge "Use errno correctly."
2015-08-15 Elliott Hughesam 6d24e086: Merge "Remove dead code."
2015-08-15 Elliott Hughesam 6d24e086: Merge "Remove dead code."
2015-07-03 Jeff SharkeyMerge commit '3ff337db' into merge
2015-07-02 Jeff Sharkeyam c86ab6f5: Trim both internal and adopted private...
2015-07-01 Jeff SharkeyTrim both internal and adopted private storage.
2015-06-26 Jeff Sharkeyam 8da07375: am 63123c06: Last ditch check for partitio...
2015-06-26 Jeff Sharkeyam 63123c06: Last ditch check for partition on raw...
2015-06-26 Jeff SharkeyLast ditch check for partition on raw disk.
2015-06-24 Paul CrowleyMerge "Fix erroneous comment in secdiscard.cpp, plus...
2015-06-22 Jeff Sharkeyam b5e680ac: am bc40cc8f: Add method to forget private...
2015-06-22 Jeff Sharkeyam bc40cc8f: Add method to forget private partition...
2015-06-22 Jeff SharkeyAdd method to forget private partition keys.
2015-06-09 Jeff Sharkeyam d6a77b51: am d0640f63: Add f2fs support for private...
2015-06-09 Jeff Sharkeyam d0640f63: Add f2fs support for private volumes.
2015-06-09 Jeff SharkeyAdd f2fs support for private volumes.
2015-05-13 Kenny Rootresolved conflicts for merge of 9df68a13 to mnc-dev...
2015-05-13 Paul Crowleyam eb0c05ce: Merge "Break key installation into its...
2015-05-07 Paul Lawrenceam 86ddbbf4: Merge "Delete password as per block encryp...
2015-05-06 Paul Crowleyam 42696d97: Merge "Make vdc a C++ file as a base for...
2015-05-06 Paul Lawrenceam eae7fc77: Merge "Fix problem that reading/writing...
2015-05-06 Paul Lawrenceam b32ebf30: Merge "Retry unmounts in ext4 encryption"
2015-05-06 Paul Lawrenceam 4571383c: Merge "Use default key permissions for...
2015-05-06 Paul Lawrenceam 0f29aec5: Merge "Simplify password checking logic"
2015-05-01 Paul Lawrenceam babba576: Merge "Enable properties in ext4enc"
2015-04-30 Paul Lawrenceam 744a7aa5: Merge "Check password is correct by checki...
2015-04-30 Paul Lawrenceam d7399147: Merge "New ext4enc kernel switching from...
2015-04-29 Paul LawrenceMerge commit 'c3e4cc29' into manualmerge
2015-04-29 Jeff Sharkeyam ba6747f1: Scan failure still means we finished scan.
next