system_core.git - system/core

	Commit message (Expand)	Author	Age	Files	Lines
*	am 8b448629: am 16092b7a: Merge "fs_mgr: allow for zramsize to be specified a...	Iliyan Malchev	2015-05-12	1	-1/+21
\|\
\| *	Merge "fs_mgr: allow for zramsize to be specified as percentage of total memo...	Iliyan Malchev	2015-05-12	1	-1/+21
\| \|\
\| \| *	fs_mgr: allow for zramsize to be specified as percentage of total memory	Iliyan Malchev	2015-05-01	1	-1/+21
* \| \|	am 48ba7587: am 34dd04db: Merge "Improve bad error reporting seen in shamu SE...	Elliott Hughes	2015-04-24	1	-1/+4
\|\ \ \
\| * \| \|	Improve bad error reporting seen in shamu SELinux boot failures.	Elliott Hughes	2015-04-24	1	-1/+4
* \| \| \|	resolved conflicts for merge of 79f33846 to lmp-mr1-dev-plus-aosp	Ed Tam	2015-04-13	6	-5/+171
\|\ \ \ \ \| \|/ / / \|/\| / / \| \|/ /
\| * \|	fs_mgr: introduce fs_mgr_format to format wiped partitions	Chris Fries	2015-04-10	6	-3/+171
* \| \|	Revert "Revert "fs_mgr_verity: Add support for squashfs""	Mohamad Ayyash	2015-04-08	2	-27/+54
* \| \|	Merge "Revert "fs_mgr_verity: Add support for squashfs""	Mohamad Ayyash	2015-04-08	2	-39/+26
\|\ \ \
\| * \| \|	Revert "fs_mgr_verity: Add support for squashfs"	Mohamad Ayyash	2015-04-08	2	-39/+26
* \| \| \|	Merge "fs_mgr_verity: Add support for squashfs"	Mohamad Ayyash	2015-04-08	2	-26/+39
\|\ \ \ \ \| \|/ / /
\| * \| \|	fs_mgr_verity: Add support for squashfs	Mohamad Ayyash	2015-04-06	2	-26/+39
* \| \| \|	Merge "Restore verity state when verified partition is reflashed"	Sami Tolvanen	2015-04-07	1	-20/+117
\|\ \ \ \
\| * \| \| \|	Restore verity state when verified partition is reflashed	Sami Tolvanen	2015-03-31	1	-20/+117
* \| \| \| \|	Merge "Set verity mode as the verified property value"	Sami Tolvanen	2015-04-07	2	-31/+37
\|\ \ \ \ \ \| \|/ / / / \| \| / / / \| \|/ / / \|/\| \| \|
\| * \| \|	Set verity mode as the verified property value	Sami Tolvanen	2015-03-31	2	-31/+37
* \| \| \|	Link libc++_static into fs_mgr.	Dan Albert	2015-04-01	1	-0/+1
* \| \| \|	Revert "Revert "Adding e4crypt support""	Paul Lawrence	2015-03-31	4	-27/+102
\|/ / /
* \| \|	Fix build	Sami Tolvanen	2015-03-26	1	-15/+14
* \| \|	Use structured format for verity metadata	Sami Tolvanen	2015-03-24	3	-63/+197
* \| \|	Add init command to set verified properties	Sami Tolvanen	2015-03-19	2	-7/+20
* \| \|	Merge "Do not call libcutils property_set in init through libfs_mgr"	Sami Tolvanen	2015-03-11	1	-27/+1
\|\ \ \
\| * \| \|	Do not call libcutils property_set in init through libfs_mgr	Sami Tolvanen	2015-03-05	1	-27/+1
* \| \| \|	am 291ce5b8: Merge "Fs_mgr: Fix format code"	Andreas Gampe	2015-03-04	1	-1/+1
\|\ \ \ \ \| \|/ / /
\| * \| \|	Fs_mgr: Fix format code	Andreas Gampe	2015-03-04	1	-1/+1
* \| \| \|	am a88fb24a: Merge "Add fs_mgr support for dm-verity modes"	Sami Tolvanen	2015-03-04	2	-10/+343
\|\ \ \ \ \| \|/ / /
\| * \| \|	Merge "Add fs_mgr support for dm-verity modes"	Sami Tolvanen	2015-03-04	2	-10/+343
\| \|\ \ \
\| \| * \| \|	Add fs_mgr support for dm-verity modes	Sami Tolvanen	2015-03-04	2	-10/+343
* \| \| \| \|	am fbb3f8ca: Merge "Set underlying block device RO when enabling verity"	Sami Tolvanen	2015-02-28	3	-6/+14
\|\ \ \ \ \ \| \|/ / / /
\| * \| \| \|	Set underlying block device RO when enabling verity	Sami Tolvanen	2015-02-27	3	-6/+14
\| \|/ / /
* \| \| \|	Merge commit '9c1bc6bbc82e3e4f005e9fcacfca94b2dd82ca31' into HEAD	Bill Yi	2015-02-19	4	-11/+8
\|\ \ \ \ \| \|/ / / \|/\| \| \|
\| * \| \|	am 317b4024: Revert "Make encryption configurable"	Paul Lawrence	2015-02-07	3	-7/+3
\| \|\ \ \ \| \| \|/ /
\| \| * \|	Revert "Make encryption configurable"	Paul Lawrence	2015-02-06	3	-7/+3
\| * \| \|	am 17b5b352: Merge "fs_mgr: error check umount calls / add retry logic"	Nick Kralevich	2015-02-06	2	-3/+14
\| \|\ \ \
\| * \ \ \	am bda62724: Make encryption configurable	Paul Lawrence	2015-01-26	3	-3/+7
\| \|\ \ \ \ \| \| \| \|/ / \| \| \|/\| \|
\| \| * \| \|	Make encryption configurable	Paul Lawrence	2015-01-21	3	-3/+7
\| * \| \| \|	am 4e0bdd10: Merge "fs_mgr: Support filesystem labels in fstab"	Elliott Hughes	2015-01-23	1	-0/+91
\| \|\ \ \ \
\| * \ \ \ \	am 4083ed7d: Merge "Revert "fs_mgr: Support filesystem labels in fstab""	Elliott Hughes	2015-01-23	1	-91/+0
\| \|\ \ \ \ \
\| * \ \ \ \ \	am f9e23395: Merge "fs_mgr: Support filesystem labels in fstab"	JP Abgrall	2015-01-23	1	-0/+91
\| \|\ \ \ \ \ \
\| * \ \ \ \ \ \	am f2bd3fdd: Merge "Provide a way to select force encryption from vendor part...	Leo Wang	2015-01-09	1	-1/+12
\| \|\ \ \ \ \ \ \ \| \| \| \|_\|_\|/ / / \| \| \|/\| \| \| \| \|
\| \| * \| \| \| \| \|	Provide a way to select force encryption from vendor partition	Paul Lawrence	2015-01-07	1	-1/+12
\| \| \| \|_\|_\|_\|/ \| \| \|/\| \| \| \|
\| * \| \| \| \| \|	am a97c1075: Merge "Fix Nick\'s nits"	Elliott Hughes	2014-12-10	1	-4/+4
\| \|\ \ \ \ \ \
\| * \ \ \ \ \ \	am 294e610f: Merge "Fix verity on system partitions larger than 2G"	Elliott Hughes	2014-12-10	1	-3/+4
\| \|\ \ \ \ \ \ \
\| * \ \ \ \ \ \ \	resolved conflicts for merge of b471f524 to lmp-mr1-dev-plus-aosp	Elliott Hughes	2014-12-09	1	-11/+8
\| \|\ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \	am 72f0d92c: DO NOT MERGE: Do not mount devices with invalid verity metadata	Sami Tolvanen	2014-11-14	1	-1/+3
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \|_\|_\|/ / / / / \| \| \|/\| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	DO NOT MERGE: Do not mount devices with invalid verity metadata	Sami Tolvanen	2014-11-13	1	-1/+3
\| * \| \| \| \| \| \| \| \|	am 9573a13b: DO NOT MERGE: Switch fs_mgr to use SHA-256 instead of SHA-1	Sami Tolvanen	2014-11-14	1	-3/+3
\| \|\ \ \ \ \ \ \ \ \ \| \| \|/ / / / / / / /
\| \| * \| \| \| \| \| \| \|	DO NOT MERGE: Switch fs_mgr to use SHA-256 instead of SHA-1	Sami Tolvanen	2014-11-13	1	-3/+3
\| * \| \| \| \| \| \| \| \|	fs_mgr: let fsck.f2fs actually attempt a fix	JP Abgrall	2014-11-12	1	-1/+2
\| \|\ \ \ \ \ \ \ \ \ \| \| \|/ / / / / / / /
\| \| * \| \| \| \| \| \| \|	fs_mgr: let fsck.f2fs actually attempt a fix	JP Abgrall	2014-11-08	1	-1/+2