- b4a3c55 DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master by Xin Li · 5 years ago
- 483de9f Merge "Send earlyBootEnded notice to all Keymasters" am: 0e9fbe4a3e by Treehugger Robot · 5 years ago
- 0e9fbe4 Merge "Send earlyBootEnded notice to all Keymasters" by Treehugger Robot · 5 years ago
- 28eddbd Send earlyBootEnded notice to all Keymasters by Shawn Willden · 5 years ago
- cd5936e Merge "Choose options format using property" am: 479588c68e am: 30c1b0225e by Paul Crowley · 5 years ago
- 30c1b02 Merge "Choose options format using property" am: 479588c68e by Paul Crowley · 5 years ago
- 479588c Merge "Choose options format using property" by Paul Crowley · 5 years ago
- f56d553 Choose options format using property by Paul Crowley · 5 years ago
- 0c0ed9d Merge "[vold] update with incfs_ndk.h" am: 29ee196fb5 am: e296f9cbf6 by Yurii Zubrytskyi · 5 years ago
- e296f9c Merge "[vold] update with incfs_ndk.h" am: 29ee196fb5 by Yurii Zubrytskyi · 5 years ago
- 29ee196 Merge "[vold] update with incfs_ndk.h" by Yurii Zubrytskyi · 5 years ago
- 2781933 [vold] update with incfs_ndk.h by Songchun Fan · 5 years ago
- 1c29e84 [automerger skipped] Block and wait for /dev/block/loop<N> to appear in case it was created asynchronously. am: 5ba8aeaa80 -s ours by David Anderson · 5 years ago
- 5ba8aea Block and wait for /dev/block/loop<N> to appear in case it was created asynchronously. by David Anderson · 6 years ago
- 5880227 Merge changes from topic "merge-incremental-vold" am: 10a372f1d2 am: 41c1c40afc by Yurii Zubrytskyi · 5 years ago
- b52e063 Expose new IncFS interface through Vold am: d05bcc8070 am: 636da65360 by Yurii Zubrytskyi · 5 years ago
- 41c1c40 Merge changes from topic "merge-incremental-vold" am: 10a372f1d2 by Yurii Zubrytskyi · 5 years ago
- 636da65 Expose new IncFS interface through Vold am: d05bcc8070 by Yurii Zubrytskyi · 5 years ago
- 10a372f Merge changes from topic "merge-incremental-vold" by Yurii Zubrytskyi · 5 years ago
- 9e7482e [vold] Add argument verification to IncFS methods by Yurii Zubrytskyi · 5 years ago
- d05bcc8 Expose new IncFS interface through Vold by Yurii Zubrytskyi · 5 years ago
- 8db17c3 DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp@6304901 into stag-aosp-master am: 4e13a60b8d by Xin Li · 5 years ago
- 4e13a60 DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp@6304901 into stag-aosp-master by Xin Li · 5 years ago
- b06025a Merge "fskeyring & userspace reboot: support CE keys" am: eaa3443ad8 am: 91ba0c8fa4 by Automerger Merge Worker · 5 years ago
- 91ba0c8 Merge "fskeyring & userspace reboot: support CE keys" am: eaa3443ad8 by Automerger Merge Worker · 5 years ago
- eaa3443 Merge "fskeyring & userspace reboot: support CE keys" by Nikita Ioffe · 5 years ago
- 1c6731c fskeyring & userspace reboot: support CE keys by Nikita Ioffe · 5 years ago
- af5251b Merge "Use the blk_device supplied by vdc encryptFstab" am: 3b3a13a81a am: eeb005eb7d by Automerger Merge Worker · 5 years ago
- eeb005e Merge "Use the blk_device supplied by vdc encryptFstab" am: 3b3a13a81a by Automerger Merge Worker · 5 years ago
- 3b3a13a Merge "Use the blk_device supplied by vdc encryptFstab" by Paul Crowley · 5 years ago
- 21505d9 Merge "fskeyring & userspace reboot: support DE keys" am: 3b719ed32e am: ac589ee784 by Automerger Merge Worker · 5 years ago
- ac589ee Merge "fskeyring & userspace reboot: support DE keys" am: 3b719ed32e by Automerger Merge Worker · 5 years ago
- 3b719ed Merge "fskeyring & userspace reboot: support DE keys" by Nikita Ioffe · 5 years ago
- f0550af fskeyring & userspace reboot: support DE keys by Nikita Ioffe · 5 years ago
- 96ef136 Merge "umount /data/user/0 before umount /data" am: 3a0fd35b62 am: 20f9f29d53 by Automerger Merge Worker · 5 years ago
- 20f9f29 Merge "umount /data/user/0 before umount /data" am: 3a0fd35b62 by Automerger Merge Worker · 5 years ago
- 3a0fd35 Merge "umount /data/user/0 before umount /data" by Treehugger Robot · 5 years ago
- 3cf3233 umount /data/user/0 before umount /data by Hyangseok Chae · 5 years ago
- 48aa90c Use the blk_device supplied by vdc encryptFstab by Paul Crowley · 5 years ago
- 65f67bb Merge "Use optional for nullable types" am: deb7085453 am: c63694c6e1 by Automerger Merge Worker · 5 years ago
- c63694c Merge "Use optional for nullable types" am: deb7085453 by Automerger Merge Worker · 5 years ago
- deb7085 Merge "Use optional for nullable types" by Jooyung Han · 5 years ago
- d75a10a Use optional for nullable types by Jooyung Han · 5 years ago
- f0bea38 Merge "Make CTS not HEH the default post Q" am: 39969f0288 am: 17d85205bd by Automerger Merge Worker · 5 years ago
- 17d8520 Merge "Make CTS not HEH the default post Q" am: 39969f0288 by Automerger Merge Worker · 5 years ago
- 39969f0 Merge "Make CTS not HEH the default post Q" by Treehugger Robot · 5 years ago
- eb241a1 Make CTS not HEH the default post Q by Paul Crowley · 5 years ago
- 7b9b164 Merge "Fix unaligned access to auth token user_id" am: 21a17b091e am: 01759662fd by Automerger Merge Worker · 5 years ago
- 923309a Merge "Remove unused code in VoldUtil.h" am: e19189bd7f am: b6421644ec by Automerger Merge Worker · 5 years ago
- c14f46d Merge changes from topics "metadata_wrapped_key_aosp", "volume_metadata" am: 36fd1ebfae am: 6891eb7e2d by Automerger Merge Worker · 5 years ago
- 0175966 Merge "Fix unaligned access to auth token user_id" am: 21a17b091e by Automerger Merge Worker · 5 years ago
- b642164 Merge "Remove unused code in VoldUtil.h" am: e19189bd7f by Automerger Merge Worker · 5 years ago
- 6891eb7 Merge changes from topics "metadata_wrapped_key_aosp", "volume_metadata" am: 36fd1ebfae by Automerger Merge Worker · 5 years ago
- 21a17b0 Merge "Fix unaligned access to auth token user_id" by Paul Crowley · 5 years ago
- e19189b Merge "Remove unused code in VoldUtil.h" by Paul Crowley · 5 years ago
- 36fd1eb Merge changes from topics "metadata_wrapped_key_aosp", "volume_metadata" by Paul Crowley · 5 years ago
- 886e572 On newer devices, use dm-default-key to encrypt SD cards by Paul Crowley · 5 years ago
- 312b7df vold: Wrapped key support for metadata encryption by Barani Muthukumaran · 5 years ago
- 249c2fb Refactor: make makeGen local by Paul Crowley · 5 years ago
- d281de7 Fix unaligned access to auth token user_id by Paul Crowley · 7 years ago
- 2ae9673 Remove unused code in VoldUtil.h by Paul Crowley · 5 years ago
- bdd9fbf Merge "Refactor key generation to handle both normal and metadata encryption." am: 8e0780cba2 am: 79b853551d by Paul Crowley · 5 years ago
- 79b8535 Merge "Refactor key generation to handle both normal and metadata encryption." am: 8e0780cba2 by Paul Crowley · 5 years ago
- 8e0780c Merge "Refactor key generation to handle both normal and metadata encryption." by Paul Crowley · 5 years ago
- 4eac264 Refactor key generation to handle both normal and metadata encryption. by Paul Crowley · 5 years ago
- 41bac01 Merge "Refactor MetadataCrypt.cpp to make create_crypto_blk_dev more general" am: 7566e467ab am: b272b21a0a by Paul Crowley · 5 years ago
- b272b21 Merge "Refactor MetadataCrypt.cpp to make create_crypto_blk_dev more general" am: 7566e467ab by Paul Crowley · 5 years ago
- 7566e46 Merge "Refactor MetadataCrypt.cpp to make create_crypto_blk_dev more general" by Paul Crowley · 5 years ago
- 54d05de Merge changes Ic3993c1f,I06645bb4 am: ac34e9aa3e am: b62afed286 by Paul Crowley · 5 years ago
- b62afed Merge changes Ic3993c1f,I06645bb4 am: ac34e9aa3e by Paul Crowley · 5 years ago
- ac34e9a Merge changes Ic3993c1f,I06645bb4 by Paul Crowley · 5 years ago
- 572c024 Refactor MetadataCrypt.cpp to make create_crypto_blk_dev more general by Paul Crowley · 5 years ago
- 220567c Generalize CryptoType infrastructure by Paul Crowley · 5 years ago
- a661fb6 Refactor CryptoType to use better names, and size_t not uint32_t by Paul Crowley · 5 years ago
- e3609aa Merge "Use DM layer directly to manage private DM volumes" am: dd12ea5bd2 am: 47aff8772d by Automerger Merge Worker · 5 years ago
- 47aff87 Merge "Use DM layer directly to manage private DM volumes" am: dd12ea5bd2 by Automerger Merge Worker · 5 years ago
- dd12ea5 Merge "Use DM layer directly to manage private DM volumes" by Paul Crowley · 5 years ago
- aebcc39 Merge "Pass volume key as a KeyBuffer" am: 334a684557 am: 4d37b4f980 by Automerger Merge Worker · 5 years ago
- 4d37b4f Merge "Pass volume key as a KeyBuffer" am: 334a684557 by Automerger Merge Worker · 5 years ago
- 334a684 Merge "Pass volume key as a KeyBuffer" by Treehugger Robot · 5 years ago
- 54d5e5c Merge "vold: Support Storage keys for FBE" am: 8cfb530357 am: aafbd4066a by Automerger Merge Worker · 5 years ago
- aafbd40 Merge "vold: Support Storage keys for FBE" am: 8cfb530357 by Automerger Merge Worker · 5 years ago
- 8cfb530 Merge "vold: Support Storage keys for FBE" by Treehugger Robot · 5 years ago
- 659b63f Use DM layer directly to manage private DM volumes by Paul Crowley · 5 years ago
- 3d98f5d Pass volume key as a KeyBuffer by Paul Crowley · 5 years ago
- 3dfb094 vold: Support Storage keys for FBE by Barani Muthukumaran · 5 years ago
- bf35287 Merge "Have vold inform keymaster that early boot ended" am: 68b9fb10ae am: fce0d92ce4 by Automerger Merge Worker · 5 years ago
- fce0d92 Merge "Have vold inform keymaster that early boot ended" am: 68b9fb10ae by Automerger Merge Worker · 5 years ago
- 68b9fb1 Merge "Have vold inform keymaster that early boot ended" by Treehugger Robot · 5 years ago
- 3660bf9 Merge "Update vold to use KM4.1" am: 6c5f302a90 am: 53f8e2df82 by Automerger Merge Worker · 5 years ago
- 53f8e2d Merge "Update vold to use KM4.1" am: 6c5f302a90 by Automerger Merge Worker · 5 years ago
- 6c5f302 Merge "Update vold to use KM4.1" by Treehugger Robot · 5 years ago
- 2b1ff5a Have vold inform keymaster that early boot ended by Shawn Willden · 5 years ago
- 35f0f22 Update vold to use KM4.1 by Shawn Willden · 5 years ago
- 1541f9f Merge "Use std::string to return crypto device, not char *" am: 80731b0975 am: 2381810b99 by Automerger Merge Worker · 5 years ago
- 2381810 Merge "Use std::string to return crypto device, not char *" am: 80731b0975 by Automerger Merge Worker · 5 years ago
- 80731b0 Merge "Use std::string to return crypto device, not char *" by Paul Crowley · 5 years ago
- ebbabdc Merge "Refactor: make cryptfs.h smaller" am: 98c501d28e am: 645c2f40a0 by Automerger Merge Worker · 5 years ago
- 645c2f4 Merge "Refactor: make cryptfs.h smaller" am: 98c501d28e by Automerger Merge Worker · 5 years ago
- 98c501d Merge "Refactor: make cryptfs.h smaller" by Treehugger Robot · 5 years ago