summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2012-06-15Unmount all asec apps before encryptingandroid-4.1.1_r6.1android-4.1.1_r6android-4.1.1_r5android-4.1.1_r4android-4.1.1_r3android-4.1.1_r2android-4.1.1_r1.1android-4.1.1_r1jb-releaseKen Sumrall
2012-05-14merge in jb-release history after reset to jb-devThe Android Automerger
2012-05-10Merge "Sleep to wait for dm to create node" into jb-devKenny Root
2012-05-10Native library loading needs to read directoryKenny Root
2012-05-10Only set permissions on dirs or filesKenny Root
2012-05-10Sleep to wait for dm to create nodeKenny Root
2012-05-10Native library loading needs to read directoryKenny Root
2012-05-10Only set permissions on dirs or filesKenny Root
2012-05-02merge in jb-release history after reset to jb-devThe Android Automerger
2012-05-01Changes to encryption to work with the new filesystem managerKen Sumrall
2012-04-27Fix truncation of ASEC idsKenny Root
2012-04-27Fix truncation of ASEC idsKenny Root
2012-04-25Add in ext4 support for ASEC containersKenny Root
2012-03-21Merge remote-tracking branch 'goog/ics-aah-exp'Mike Lockwood
2012-03-21Merge commit '43b80c229bdee7f32654e2ec561078c5c94c8851'Mike Lockwood
2012-03-09Merge "Fix vdc to add sequence number for NativeConectorDaemon"Ken Sumrall
2012-03-09Merge "Fix to not return a bogus decryption error when a device is not encryp...Ken Sumrall
2012-03-09Fix vdc to add sequence number for NativeConectorDaemonKen Sumrall
2012-03-07Merge "Use sched_policy to avoid hard-coded cpuctl path"Glenn Kasten
2012-03-05Use sched_policy to avoid hard-coded cpuctl pathGlenn Kasten
2012-02-29Use the new command numbering scheme.Robert Greenwalt
2012-02-23vold: add -Werror=formatNick Kralevich
2012-02-16Add support for wiping data immediately if crypt failsMike Lockwood
2012-02-15Add support for wiping data immediately if crypt failsMike Lockwood
2011-12-14Fix to not return a bogus decryption error when a device is not encrypted.Ken Sumrall
2011-10-28keep previous history after reset to mr1 plus aah changes (ics-aah-wip)Ed Heyl
2011-10-26undo reset to ics-mr1 until we have a better methodEd Heyl
2011-10-26reset to ics-mr1, but keep historyEd Heyl
2011-10-25am 8c487331: (-s ours) Rename LOG() to ALOG() DO NOT MERGESteve Block
2011-10-25Rename LOG() to ALOG() DO NOT MERGESteve Block
2011-10-12Add the new verifypw command to vold/cryptfsandroid-sdk-adt_r16.0.1android-sdk-4.0.3_r1android-sdk-4.0.3-tools_r1android-cts-verifier-4.0_r1android-cts-verifier-4.0.3_r1android-cts-4.0_r1android-cts-4.0.3_r2android-cts-4.0.3_r1android-4.0.4_r2.1android-4.0.4_r2android-4.0.4_r1.2android-4.0.4_r1.1android-4.0.4_r1android-4.0.3_r1.1android-4.0.3_r1android-4.0.2_r1android-4.0.1_r1.2android-4.0.1_r1.1android-4.0.1_r1ics-mr1-releaseics-mr1ics-mr0-releaseics-mr0ics-factoryrom-2-releaseKen Sumrall
2011-09-14Fix cryptfs to work with a raw block device for key storageKen Sumrall
2011-08-31Add the ability to revert a crypto mapping when unmounting a volumeKen Sumrall
2011-07-18Reconcile with gingerbread-releaseThe Android Open Source Project
2011-07-14am 6c190fd3: am 137858b4: resolved conflicts for merge of 5284bcff to gingerb...David 'Digit' Turner
2011-07-14am 137858b4: resolved conflicts for merge of 5284bcff to gingerbread-plus-aospDavid 'Digit' Turner
2011-07-14resolved conflicts for merge of 5284bcff to gingerbread-plus-aospDavid 'Digit' Turner
2011-07-12Merge "Remove the simulator target from all makefiles. Bug: 5010576"Jeff Brown
2011-07-11Remove the simulator target from all makefiles.Jeff Brown
2011-07-11Merge "Prevent sharing or formatting of a vold managed volumes during encrypt...Ken Sumrall
2011-07-11Prevent sharing or formatting of a vold managed volumes during encryption.Ken Sumrall
2011-07-11Merge "Fix to display the proper percentage complete during encryption."Ken Sumrall
2011-07-11Fix to display the proper percentage complete during encryption.Ken Sumrall
2011-07-08reset, and keep historyandroid-merger
2011-07-08merge intel x86 patches into gingerbread branchandroid-cts-2.3_r12android-cts-2.3_r11android-cts-2.3_r10gingerbreadDavid 'Digit' Turner
2011-07-07Reconcile with gingerbread-releaseThe Android Open Source Project
2011-07-07Revert "add bounds checking for mPartMinors[]"android-merger
2011-07-07Revert "vold: Enable the SO_PASSCRED socket option"android-merger
2011-07-06vold: retry mounting partitionJoseph Lehrer
2011-06-29am 273d3549: am 2c9d8de7: Merge "Prevent buffer overflows."Mike Lockwood