1765 Commits (a94fc7cdcd853923c84b903e89257b80a53b6410)

 

All Branches   

Search

Author	SHA1	Message	Date
Paul Crowley	421ffeca7c	Merge "e4crypt_is_native has been moved into system/extras." into nyc-dev am: cfa03d4a4c am: 269bdbcab1 ... am: b0f2d02d49 * commit 'b0f2d02d49dcb526426b2b590a53b80ff47c785d': e4crypt_is_native has been moved into system/extras. Change-Id: Ib6e4a66c0081439670b6b03fd8939d911faf14d3	8 years ago
Android Build Merger (Role)	fc592066a7	Merge "Merge "e4crypt_is_native has been moved into system/extras." into nyc-dev am: cfa03d4a4c am: 44ddebaac0" into nyc-mr1-dev-plus-aosp	8 years ago
Paul Crowley	b0f2d02d49	Merge "e4crypt_is_native has been moved into system/extras." into nyc-dev am: cfa03d4a4c ... am: 269bdbcab1 * commit '269bdbcab18aa8c24a637937d885c045f408a12e': e4crypt_is_native has been moved into system/extras. Change-Id: I7f08893a1e21891d35578180cbb66a4db2d91c15	8 years ago
Paul Crowley	7678f7e8e9	Merge "e4crypt_is_native has been moved into system/extras." into nyc-dev am: cfa03d4a4c ... am: 44ddebaac0 * commit '44ddebaac0465a9a88b68ca04bbb69b576a0d067': e4crypt_is_native has been moved into system/extras. Change-Id: I02d14adeed72858771b5838e618b1fa8735ca7b1	8 years ago
Paul Crowley	44ddebaac0	Merge "e4crypt_is_native has been moved into system/extras." into nyc-dev ... am: cfa03d4a4c * commit 'cfa03d4a4c53acf41dca2c41a2efd00de06043bb': e4crypt_is_native has been moved into system/extras. Change-Id: I345475c44fb2d8812a25c9f2195c748cddc55bfe	8 years ago
Paul Crowley	269bdbcab1	Merge "e4crypt_is_native has been moved into system/extras." into nyc-dev ... am: cfa03d4a4c * commit 'cfa03d4a4c53acf41dca2c41a2efd00de06043bb': e4crypt_is_native has been moved into system/extras. Change-Id: Id199621d0e5544acadc4a4d4308a80c47b9ea3c8	8 years ago
Paul Crowley	cfa03d4a4c	Merge "e4crypt_is_native has been moved into system/extras." into nyc-dev	8 years ago
Paul Crowley	cb4ef1b58b	Merge "Revert "Two phases to set the password for disk encryption" am: d402389290 am: 26642bf7bf" into nyc-mr1-dev-plus-aosp ... am: 8d5165ab0f * commit '8d5165ab0fbf0dcf3e639bb1dbdc11ed6c152f8b': Change-Id: I412b2816fb1fcf4fbefc9a72c8d6852a79d1eace	8 years ago
Paul Crowley	fde5c3dd0b	Revert "Two phases to set the password for disk encryption" am: d402389290 am: 2f8b7d354c ... am: 6a87b09b32 * commit '6a87b09b32adc739b524002354b21bf235ff2153': Revert "Two phases to set the password for disk encryption" Change-Id: Ic7eec73c5fba36a17e3303f2cf06aee1a7435913	8 years ago
Android Build Merger (Role)	8d5165ab0f	Merge "Revert "Two phases to set the password for disk encryption" am: d402389290 am: 26642bf7bf" into nyc-mr1-dev-plus-aosp	8 years ago
Paul Crowley	aa79651bcd	Revert "Two phases to set the password for disk encryption" am: d402389290 ... am: 26642bf7bf * commit '26642bf7bf8f645f3d10fe0d36149d5f8b3b92fb': Revert "Two phases to set the password for disk encryption" Change-Id: If0ecc2132c5012ccc9c28912170b2e91a451ac99	8 years ago
Paul Crowley	6a87b09b32	Revert "Two phases to set the password for disk encryption" am: d402389290 ... am: 2f8b7d354c * commit '2f8b7d354c59b74cec719531728523bf19f88dce': Revert "Two phases to set the password for disk encryption" Change-Id: I89687b6a813caca0c214787d3e28d4e4106e7fe2	8 years ago
Paul Crowley	2f8b7d354c	Revert "Two phases to set the password for disk encryption" ... am: d402389290 * commit 'd402389290eeef86be7eb9241e20fdd125d44eb1': Revert "Two phases to set the password for disk encryption" Change-Id: I09735798116dd4e37dda60651dc085a09090a99d	8 years ago
Paul Crowley	26642bf7bf	Revert "Two phases to set the password for disk encryption" ... am: d402389290 * commit 'd402389290eeef86be7eb9241e20fdd125d44eb1': Revert "Two phases to set the password for disk encryption" Change-Id: I53a3804fc7bff9c99840aeee36fc4b7ff8e46ac1	8 years ago
Paul Crowley	d402389290	Revert "Two phases to set the password for disk encryption" ... This reverts commit 92c5eeb467. Bug: 28694324 Change-Id: Ibbbaff287f4dd28f4a13e122a3617987a8875a44	8 years ago
Paul Crowley	4d2d5244d6	e4crypt_is_native has been moved into system/extras. ... Bug: 28318405 Change-Id: Id962764cf7fb5f58b769bf99aeb6d3d69cb66991	8 years ago
Paul Crowley	f77b2ae4f8	Two phases to set the password for disk encryption am: 92c5eeb467 am: 4e44272c3d ... am: a6bc1fea18 * commit 'a6bc1fea1853f917d57f78233fe312ec19343a2f': Change-Id: Ie434a2b1ebf510ebc7e76f234eb305dbda65f282	8 years ago
Paul Crowley	b48e157e07	Two phases to set the password for disk encryption am: 92c5eeb467 am: bc7cfa8fcc ... am: c7e803bcc9 * commit 'c7e803bcc913e70f4cf8047e16f4f758d080c3fe': Two phases to set the password for disk encryption Change-Id: I09dedebcb3dd91b0a045f1c920d43c9fc7a756cb	8 years ago
Paul Crowley	a6bc1fea18	Two phases to set the password for disk encryption am: 92c5eeb467 ... am: 4e44272c3d * commit '4e44272c3d1e2f5c0040acefc3812781aeea1736': Change-Id: I0eb0825eee3faffb27736cdaf92b98983369ef47	8 years ago
Paul Crowley	c7e803bcc9	Two phases to set the password for disk encryption am: 92c5eeb467 ... am: bc7cfa8fcc * commit 'bc7cfa8fcce8b09d308a7e511c5a2d4de530676a': Two phases to set the password for disk encryption Change-Id: Ifcde4025a0ce196c8208f802a6a5dfb4a24e2a0d	8 years ago
Paul Crowley	bc7cfa8fcc	Two phases to set the password for disk encryption ... am: 92c5eeb467 * commit '92c5eeb46779f0fa1c9e6db6b0d632d960cbb2e4': Two phases to set the password for disk encryption Change-Id: Ie10cfc91d59f38359560682ca5e4133dc8700c12	8 years ago
Paul Crowley	4e44272c3d	Two phases to set the password for disk encryption ... am: 92c5eeb467 * commit '92c5eeb46779f0fa1c9e6db6b0d632d960cbb2e4': Two phases to set the password for disk encryption Change-Id: I82c1cfa2874ac4709e42f5c2047c832cbcaccb91	8 years ago
Paul Crowley	92c5eeb467	Two phases to set the password for disk encryption ... In one phase, we make the new password work, and in the second we make it the only one which works ("fixation"). This means that we can set the password in Gatekeeper between these two phases, and a crash doesn't break things. Unlocking a user automatically fixates the presented credential. Bug: 28154455 Change-Id: I54623c8652f0c9f72dd60388a7dc0ab2d48e81c7	8 years ago
Chih-hung Hsieh	fafde09884	Merge "Fix google-explicit-constructor warnings."	8 years ago
Chih-Hung Hsieh	c81de6f84f	Fix google-explicit-constructor warnings. ... Bug: 28341362 Change-Id: I30adc5ba8e977aa6626d12f0981fa580d1425a4e	8 years ago
Paul Lawrence	0768be9ff9	Merge "Drop caches after installing key policy to avoid cache clashes" into nyc-mr1-dev am: 235e78b9ae ... am: 7b6ff76185 * commit '7b6ff7618562802fc8b1fd8abf5c3e6589216ceb': Drop caches after installing key policy to avoid cache clashes Change-Id: Iacc5e9d73595b3bfd328e16f2b970b4e7f7b98bc	8 years ago
Paul Lawrence	7b6ff76185	Merge "Drop caches after installing key policy to avoid cache clashes" into nyc-mr1-dev ... am: 235e78b9ae * commit '235e78b9aede9d4a7f871f5064670afab5cb2d6b': Drop caches after installing key policy to avoid cache clashes Change-Id: I766e87aa700bd0a1312faac33092b3a0d20b5fd1	8 years ago
Paul Lawrence	235e78b9ae	Merge "Drop caches after installing key policy to avoid cache clashes" into nyc-mr1-dev	8 years ago
Paul Lawrence	85e3d8cd50	Drop caches after installing key policy to avoid cache clashes ... Note that this is an ugly workaround for a kernel bug. Bug: 28373400 Change-Id: Iec1ae53f4e18f06e41e8cf1fcc3ab03fc9848632	8 years ago
Paul Crowley	1b3489d1fd	Use a longer timeout on the disk encryption keys am: b3de337 am: 26335ed ... am: 1cc3cc5 * commit '1cc3cc59f6d79b59064e1021975201f086fb356d': Change-Id: Ide61c33fd6b4338e0d56fc03ca50c96e4bae4f59	8 years ago
Paul Crowley	466450df09	Use a longer timeout on the disk encryption keys am: b3de337 am: 409c083 ... am: 50da911 * commit '50da911fda64205677571d9cb1d668336cfb0f7f': Use a longer timeout on the disk encryption keys Change-Id: I43279eb3a1bd92839c2d742acc95cb96c920b5dd	8 years ago
Paul Crowley	1cc3cc59f6	Use a longer timeout on the disk encryption keys am: b3de337 ... am: 26335ed * commit '26335ed378cd31a9c31669db8756ec317efd2e97': Change-Id: I784a3b84675fdff4b5d228c3bc5acf6b106f5ec7	8 years ago
Paul Crowley	50da911fda	Use a longer timeout on the disk encryption keys am: b3de337 ... am: 409c083 * commit '409c083781f27b2924f051e8f7d130f62921ce1b': Use a longer timeout on the disk encryption keys Change-Id: I87cd4f37fdca430c3449471796ef24c3cbd7c225	8 years ago
Paul Crowley	409c083781	Use a longer timeout on the disk encryption keys ... am: b3de337 * commit 'b3de337acd7ad07de1ed30d24fdfd628d1d8590b': Use a longer timeout on the disk encryption keys Change-Id: Ie66bea62ccc5d8066a12b9a7acf26dafa4b2eaa3	8 years ago
Paul Crowley	26335ed378	Use a longer timeout on the disk encryption keys ... am: b3de337 * commit 'b3de337acd7ad07de1ed30d24fdfd628d1d8590b': Use a longer timeout on the disk encryption keys Change-Id: Ieadec9da13383361ac76bf6b79ecea948965a1d9	8 years ago
Paul Crowley	b3de337acd	Use a longer timeout on the disk encryption keys ... Avoid a timeout error by extending the time allowed between getting the auth token and decrypting the key from five to thirty seconds. Bug: 28398766 Change-Id: I1dbb9e0e33707e7de4c1720ad1b8e153c77094b2	8 years ago
John Cormie	c1e291d71b	Merge "Merge "Unmount public sdcard filesystems before killing the fuse process." into nyc-dev am: a4330be am: c1428a5" into nyc-mr1-dev-plus-aosp ... am: 04c341b * commit '04c341b0ebd3e5519efd68f5bb38728ec0fe1520': Change-Id: Ib7e296f8eb567d676ffaa482e2b3745477322fa7	8 years ago
John Cormie	2ee53ad16b	Merge "Unmount public sdcard filesystems before killing the fuse process." into nyc-dev am: a4330be am: a54cd87 ... am: 206cac8 * commit '206cac88f3fed4030ea42598bf1e10e7ac8c2899': Unmount public sdcard filesystems before killing the fuse process. Change-Id: Iae6070abc68ce59f5cbb839cc55ce8fde8d70e3f	8 years ago
Android Build Merger (Role)	04c341b0eb	Merge "Merge "Unmount public sdcard filesystems before killing the fuse process." into nyc-dev am: a4330be am: c1428a5" into nyc-mr1-dev-plus-aosp	8 years ago
John Cormie	206cac88f3	Merge "Unmount public sdcard filesystems before killing the fuse process." into nyc-dev am: a4330be ... am: a54cd87 * commit 'a54cd8739c8d313b66354f99ed9419ccc3f6be10': Unmount public sdcard filesystems before killing the fuse process. Change-Id: I11813de6b10a9a98af823443332bb07b82cc1d06	8 years ago
John Cormie	5c0ed69d96	Merge "Unmount public sdcard filesystems before killing the fuse process." into nyc-dev am: a4330be ... am: c1428a5 * commit 'c1428a51c3d343814e683e2e9864a5cfee6836a0': Unmount public sdcard filesystems before killing the fuse process. Change-Id: I0b24d5c73deb67764092f7934c72ec48937e5286	8 years ago
John Cormie	a54cd8739c	Merge "Unmount public sdcard filesystems before killing the fuse process." into nyc-dev ... am: a4330be * commit 'a4330beb482c3b5decf6a6fc966e5589210130eb': Unmount public sdcard filesystems before killing the fuse process. Change-Id: I294d46bb27fb6d8ac83f1041e849fd366134b6ee	8 years ago
John Cormie	c1428a51c3	Merge "Unmount public sdcard filesystems before killing the fuse process." into nyc-dev ... am: a4330be * commit 'a4330beb482c3b5decf6a6fc966e5589210130eb': Unmount public sdcard filesystems before killing the fuse process. Change-Id: If9f7acd5bc77ee4ecf9eed7375881b5554e85b9a	8 years ago
John Cormie	a4330beb48	Merge "Unmount public sdcard filesystems before killing the fuse process." into nyc-dev	8 years ago
Daniel Rosenberg	5138d79e89	Merge "Fix resizeAsec to determine correct size"	8 years ago
Martijn Coenen	230fd19df6	Merge "Move vold (and sdcard childs) to foreground cpuset." into nyc-dev am: 47ff14a am: 05f1d81 ... am: 01eaa5c * commit '01eaa5c78a340d874b9f5a4e6cf4c5b5975f3563': Change-Id: Iae56812fcc28604deca523c40140d0ea5eaa2e30	8 years ago
Martijn Coenen	973ccaf522	Merge "Move vold (and sdcard childs) to foreground cpuset." into nyc-dev am: 47ff14a am: f56b110 ... am: 689c11e * commit '689c11ea4741baaa36738b8e490b74badf898092': Move vold (and sdcard childs) to foreground cpuset. Change-Id: If8d4716b8dfe85f52cbbf19f7e39f38ef2110280	8 years ago
Martijn Coenen	01eaa5c78a	Merge "Move vold (and sdcard childs) to foreground cpuset." into nyc-dev am: 47ff14a ... am: 05f1d81 * commit '05f1d813cc2964339d3f606c52cd599cd378a530': Change-Id: I289125919e8cffa06a400343d201583a6d550a5c	8 years ago
Martijn Coenen	689c11ea47	Merge "Move vold (and sdcard childs) to foreground cpuset." into nyc-dev am: 47ff14a ... am: f56b110 * commit 'f56b1109197658e2da9c86d1ead93e52b3e01532': Move vold (and sdcard childs) to foreground cpuset. Change-Id: I69b5a07a0e5e5cc997ce5cfa36c154024537f490	8 years ago
Martijn Coenen	f56b110919	Merge "Move vold (and sdcard childs) to foreground cpuset." into nyc-dev ... am: 47ff14a * commit '47ff14ad38ec96fef25b2bbe1b3365fcd97bc8f5': Move vold (and sdcard childs) to foreground cpuset. Change-Id: Iad30255947ff204325736b361e883aaeaa31a473	8 years ago