)]}' { "log": [ { "commit": "4fbe49a83d41a64d44e363ccd691e7bfc41bb6af", "tree": "18f8ffafd33e096cefad64bf3170e4b90c456951", "parents": [ "8654365499f8e9956c490e98184abe33978d4e67", "96016c2d583ccca9fffd6974cb9473f7effd6cf5" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Fri Oct 31 00:11:15 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Oct 31 00:11:15 2014 +0000" }, "message": "am 96016c2d: am 9944ff09: am 70c3507d: am 450b10c9: am d0f9dc71: am e0a65f30: am f5af3a72: am 6d80b687: audio policy: validate stream type received from binder calls.\n\n* commit \u002796016c2d583ccca9fffd6974cb9473f7effd6cf5\u0027:\n audio policy: validate stream type received from binder calls.\n" }, { "commit": "96016c2d583ccca9fffd6974cb9473f7effd6cf5", "tree": "1e08676a39464d8bd88c910bb3a11585dd3229f8", "parents": [ "0d83cf22991c48f4bb5f2afe3d16ae076861f394", "9944ff09ac4eb076cab994ef245b0103f60836ba" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Thu Oct 30 23:55:43 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Oct 30 23:55:43 2014 +0000" }, "message": "am 9944ff09: am 70c3507d: am 450b10c9: am d0f9dc71: am e0a65f30: am f5af3a72: am 6d80b687: audio policy: validate stream type received from binder calls.\n\n* commit \u00279944ff09ac4eb076cab994ef245b0103f60836ba\u0027:\n audio policy: validate stream type received from binder calls.\n" }, { "commit": "9944ff09ac4eb076cab994ef245b0103f60836ba", "tree": "20b6d682440a78d7301b410d15ffc81ce45e81af", "parents": [ "97d917bc1ccc958d8f1051de6a888de9a25dc6bd", "70c3507d915baaa5a0ab163eeb0a445030f4f492" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Thu Oct 30 23:48:47 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Oct 30 23:48:47 2014 +0000" }, "message": "am 70c3507d: am 450b10c9: am d0f9dc71: am e0a65f30: am f5af3a72: am 6d80b687: audio policy: validate stream type received from binder calls.\n\n* commit \u002770c3507d915baaa5a0ab163eeb0a445030f4f492\u0027:\n audio policy: validate stream type received from binder calls.\n" }, { "commit": "70c3507d915baaa5a0ab163eeb0a445030f4f492", "tree": "ad9a132f21ff995adccfd63b56af96b69a497c66", "parents": [ "ab0b3212e0c15132f2dab2beeb39c47d31bb1dab", "450b10c97514411ef1d0d887d4e18851fd286f0b" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Thu Oct 30 23:41:08 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Oct 30 23:41:08 2014 +0000" }, "message": "am 450b10c9: am d0f9dc71: am e0a65f30: am f5af3a72: am 6d80b687: audio policy: validate stream type received from binder calls.\n\n* commit \u0027450b10c97514411ef1d0d887d4e18851fd286f0b\u0027:\n audio policy: validate stream type received from binder calls.\n" }, { "commit": "450b10c97514411ef1d0d887d4e18851fd286f0b", "tree": "b586fddb4c97ee094a3a3b266f1833f115aa2b89", "parents": [ "9b51a37fa8ad9d28be791213ceba4fcbec52b14d", "d0f9dc7156e531d5cd0615f6e682d2449e08e9a7" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Thu Oct 30 23:25:15 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Oct 30 23:25:15 2014 +0000" }, "message": "am d0f9dc71: am e0a65f30: am f5af3a72: am 6d80b687: audio policy: validate stream type received from binder calls.\n\n* commit \u0027d0f9dc7156e531d5cd0615f6e682d2449e08e9a7\u0027:\n audio policy: validate stream type received from binder calls.\n" }, { "commit": "d0f9dc7156e531d5cd0615f6e682d2449e08e9a7", "tree": "b586fddb4c97ee094a3a3b266f1833f115aa2b89", "parents": [ "cb5dc219b78e6eeacb7ee2f5c93e6763db677122", "e0a65f3008ac5874106b21d03e19296c8015da41" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Thu Oct 30 23:01:01 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Oct 30 23:01:01 2014 +0000" }, "message": "am e0a65f30: am f5af3a72: am 6d80b687: audio policy: validate stream type received from binder calls.\n\n* commit \u0027e0a65f3008ac5874106b21d03e19296c8015da41\u0027:\n audio policy: validate stream type received from binder calls.\n" }, { "commit": "e0a65f3008ac5874106b21d03e19296c8015da41", "tree": "c7f7949257bb489bb9950949190f0e90af60cf6f", "parents": [ "74abb1ae32fbd3fa4112cc8b8d53882777feb191", "f5af3a72f308cd4dff7859e62922ee5a13bd4c15" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Thu Oct 30 22:52:48 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Oct 30 22:52:48 2014 +0000" }, "message": "am f5af3a72: am 6d80b687: audio policy: validate stream type received from binder calls.\n\n* commit \u0027f5af3a72f308cd4dff7859e62922ee5a13bd4c15\u0027:\n audio policy: validate stream type received from binder calls.\n" }, { "commit": "f5af3a72f308cd4dff7859e62922ee5a13bd4c15", "tree": "a213a936d8f9261d5e2a388f1f5f4ee3e22120b0", "parents": [ "482b18bbfd6c9214157bfab47feae86df48a7178", "6d80b687c3b8d9c8da7cdad7d9813aa51c1cf15e" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Thu Oct 30 22:44:00 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Oct 30 22:44:00 2014 +0000" }, "message": "am 6d80b687: audio policy: validate stream type received from binder calls.\n\n* commit \u00276d80b687c3b8d9c8da7cdad7d9813aa51c1cf15e\u0027:\n audio policy: validate stream type received from binder calls.\n" }, { "commit": "6d80b687c3b8d9c8da7cdad7d9813aa51c1cf15e", "tree": "9080cb3987c321a7fe607e509be32e6269da138c", "parents": [ "f106b1993143df44282777253244ce67974c9d4a" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Thu Oct 30 14:46:18 2014 -0700" }, "committer": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Thu Oct 30 15:09:05 2014 -0700" }, "message": "audio policy: validate stream type received from binder calls.\n\nBug: 18001784.\nBug: 18002005.\nChange-Id: If08866a3c21bcbfd8cdbbf8336bcf1faad66f321\n" }, { "commit": "8654365499f8e9956c490e98184abe33978d4e67", "tree": "5eadf1107ddebb1371df02e7dd8203ff041d88d6", "parents": [ "5be9c1daf956c35d37585d21fff5d6b99f506560", "0d83cf22991c48f4bb5f2afe3d16ae076861f394" ], "author": { "name": "Robert Shih", "email": "robertshih@google.com", "time": "Wed Sep 10 20:48:04 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Sep 10 20:48:04 2014 +0000" }, "message": "am 0d83cf22: am 97d917bc: am ab0b3212: am 9b51a37f: am cb5dc219: am 74abb1ae: am 482b18bb: am f106b199: SampleTable: check integer overflow during table alloc\n\n* commit \u00270d83cf22991c48f4bb5f2afe3d16ae076861f394\u0027:\n SampleTable: check integer overflow during table alloc\n" }, { "commit": "0d83cf22991c48f4bb5f2afe3d16ae076861f394", "tree": "369504c26f6f15ef8cf0999c42734239a8ea7409", "parents": [ "01eed3c0fb951e349d68f4bce818bef22e7925b1", "97d917bc1ccc958d8f1051de6a888de9a25dc6bd" ], "author": { "name": "Robert Shih", "email": "robertshih@google.com", "time": "Wed Sep 10 20:26:40 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Sep 10 20:26:40 2014 +0000" }, "message": "am 97d917bc: am ab0b3212: am 9b51a37f: am cb5dc219: am 74abb1ae: am 482b18bb: am f106b199: SampleTable: check integer overflow during table alloc\n\n* commit \u002797d917bc1ccc958d8f1051de6a888de9a25dc6bd\u0027:\n SampleTable: check integer overflow during table alloc\n" }, { "commit": "97d917bc1ccc958d8f1051de6a888de9a25dc6bd", "tree": "72f3121ce893fd64854b773b5bf63b23755140bd", "parents": [ "7a107b857e658ba11c0c1fd2325ac91a2c0569a2", "ab0b3212e0c15132f2dab2beeb39c47d31bb1dab" ], "author": { "name": "Robert Shih", "email": "robertshih@google.com", "time": "Wed Sep 10 20:19:54 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Sep 10 20:19:54 2014 +0000" }, "message": "am ab0b3212: am 9b51a37f: am cb5dc219: am 74abb1ae: am 482b18bb: am f106b199: SampleTable: check integer overflow during table alloc\n\n* commit \u0027ab0b3212e0c15132f2dab2beeb39c47d31bb1dab\u0027:\n SampleTable: check integer overflow during table alloc\n" }, { "commit": "ab0b3212e0c15132f2dab2beeb39c47d31bb1dab", "tree": "7daac75a97bc2638d6697fa5423ebdc49603ded5", "parents": [ "854aa061b1e2d7eaaf8ffa2ead323c1478393c57", "9b51a37fa8ad9d28be791213ceba4fcbec52b14d" ], "author": { "name": "Robert Shih", "email": "robertshih@google.com", "time": "Wed Sep 10 20:09:14 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Sep 10 20:09:14 2014 +0000" }, "message": "am 9b51a37f: am cb5dc219: am 74abb1ae: am 482b18bb: am f106b199: SampleTable: check integer overflow during table alloc\n\n* commit \u00279b51a37fa8ad9d28be791213ceba4fcbec52b14d\u0027:\n SampleTable: check integer overflow during table alloc\n" }, { "commit": "9b51a37fa8ad9d28be791213ceba4fcbec52b14d", "tree": "8a554feec7187a238e190ace20e5baa6e242d6e4", "parents": [ "42ba5806c03753a39f85016265173819ac465745", "cb5dc219b78e6eeacb7ee2f5c93e6763db677122" ], "author": { "name": "Robert Shih", "email": "robertshih@google.com", "time": "Wed Sep 10 19:58:37 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Sep 10 19:58:37 2014 +0000" }, "message": "am cb5dc219: am 74abb1ae: am 482b18bb: am f106b199: SampleTable: check integer overflow during table alloc\n\n* commit \u0027cb5dc219b78e6eeacb7ee2f5c93e6763db677122\u0027:\n SampleTable: check integer overflow during table alloc\n" }, { "commit": "cb5dc219b78e6eeacb7ee2f5c93e6763db677122", "tree": "8a554feec7187a238e190ace20e5baa6e242d6e4", "parents": [ "72499628a24ccea0befe726de6e2b32176ddf208", "74abb1ae32fbd3fa4112cc8b8d53882777feb191" ], "author": { "name": "Robert Shih", "email": "robertshih@google.com", "time": "Wed Sep 10 19:47:42 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Sep 10 19:47:42 2014 +0000" }, "message": "am 74abb1ae: am 482b18bb: am f106b199: SampleTable: check integer overflow during table alloc\n\n* commit \u002774abb1ae32fbd3fa4112cc8b8d53882777feb191\u0027:\n SampleTable: check integer overflow during table alloc\n" }, { "commit": "74abb1ae32fbd3fa4112cc8b8d53882777feb191", "tree": "1c1a1387d466d7bd1e47f1c7ad845c3e8995f9a0", "parents": [ "25bab830af062dcaef6f75220066b221fd30957e", "482b18bbfd6c9214157bfab47feae86df48a7178" ], "author": { "name": "Robert Shih", "email": "robertshih@google.com", "time": "Wed Sep 10 19:41:45 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Sep 10 19:41:45 2014 +0000" }, "message": "am 482b18bb: am f106b199: SampleTable: check integer overflow during table alloc\n\n* commit \u0027482b18bbfd6c9214157bfab47feae86df48a7178\u0027:\n SampleTable: check integer overflow during table alloc\n" }, { "commit": "482b18bbfd6c9214157bfab47feae86df48a7178", "tree": "27e2ad82accaeafe05d3237c5624a258b9768d00", "parents": [ "3bc4f7eaf063201dc85ecc2f7c2bf2b70ab564ed", "f106b1993143df44282777253244ce67974c9d4a" ], "author": { "name": "Robert Shih", "email": "robertshih@google.com", "time": "Wed Sep 10 19:31:46 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Sep 10 19:31:46 2014 +0000" }, "message": "am f106b199: SampleTable: check integer overflow during table alloc\n\n* commit \u0027f106b1993143df44282777253244ce67974c9d4a\u0027:\n SampleTable: check integer overflow during table alloc\n" }, { "commit": "f106b1993143df44282777253244ce67974c9d4a", "tree": "b6b50164d76c427e033c044fe0412b8b478124f5", "parents": [ "0c271b750f7314e187f8479f478ad9382d9a9045" ], "author": { "name": "Robert Shih", "email": "robertshih@google.com", "time": "Mon Jul 28 09:54:57 2014 -0700" }, "committer": { "name": "Jon Larimer", "email": "jlarimer@google.com", "time": "Wed Aug 20 14:10:38 2014 +0000" }, "message": "SampleTable: check integer overflow during table alloc\n\nBug: 15328708\nBug: 15342615\nBug: 15342751\nChange-Id: I6bb110a1eba46506799c73be8ff9a4f71c7e7053\n(cherry picked from commit edd4a76eb4747bd19ed122df46fa46b452c12a0d)\n" }, { "commit": "5be9c1daf956c35d37585d21fff5d6b99f506560", "tree": "ae3cbacd3b548cc7e3b2c4fbc3e8c90d45d2b7df", "parents": [ "6f65db14e310b513c8943b236a6e61cf27cef4c7", "01eed3c0fb951e349d68f4bce818bef22e7925b1" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Thu Mar 20 13:29:33 2014 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Mar 20 13:29:33 2014 -0700" }, "message": "am 01eed3c0: am 7a107b85: am 854aa061: am 42ba5806: am 72499628: am 25bab830: Fix build\n\n* commit \u002701eed3c0fb951e349d68f4bce818bef22e7925b1\u0027:\n Fix build\n" }, { "commit": "01eed3c0fb951e349d68f4bce818bef22e7925b1", "tree": "f8ab5f1808ea539cfc77d41ddfb3a62be80f9921", "parents": [ "0e0891f8b49f31e6a28b563f86aae537e66bb6e0", "7a107b857e658ba11c0c1fd2325ac91a2c0569a2" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Thu Mar 20 13:18:07 2014 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Mar 20 13:18:07 2014 -0700" }, "message": "am 7a107b85: am 854aa061: am 42ba5806: am 72499628: am 25bab830: Fix build\n\n* commit \u00277a107b857e658ba11c0c1fd2325ac91a2c0569a2\u0027:\n Fix build\n" }, { "commit": "7a107b857e658ba11c0c1fd2325ac91a2c0569a2", "tree": "c343516caf66fb2a665705f8520c7a4e2c054688", "parents": [ "6cdc90b5e41374dd665df3ae7283ef0c1f532678", "854aa061b1e2d7eaaf8ffa2ead323c1478393c57" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Thu Mar 20 13:13:35 2014 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Mar 20 13:13:35 2014 -0700" }, "message": "am 854aa061: am 42ba5806: am 72499628: am 25bab830: Fix build\n\n* commit \u0027854aa061b1e2d7eaaf8ffa2ead323c1478393c57\u0027:\n Fix build\n" }, { "commit": "854aa061b1e2d7eaaf8ffa2ead323c1478393c57", "tree": "4dbc152a7a07fd040cd3851ad9816d2d9cceff5b", "parents": [ "ebc9b47330ab8565f7bdd9b3973a8f75e3206e77", "42ba5806c03753a39f85016265173819ac465745" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Thu Mar 20 13:08:17 2014 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Mar 20 13:08:17 2014 -0700" }, "message": "am 42ba5806: am 72499628: am 25bab830: Fix build\n\n* commit \u002742ba5806c03753a39f85016265173819ac465745\u0027:\n Fix build\n" }, { "commit": "42ba5806c03753a39f85016265173819ac465745", "tree": "80b7de0359644cc3b961bc848460e6dcbd2cf939", "parents": [ "fb49b8bad468db591f55a7064181372f02ad94a2", "72499628a24ccea0befe726de6e2b32176ddf208" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Thu Mar 20 13:04:11 2014 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Mar 20 13:04:11 2014 -0700" }, "message": "am 72499628: am 25bab830: Fix build\n\n* commit \u002772499628a24ccea0befe726de6e2b32176ddf208\u0027:\n Fix build\n" }, { "commit": "72499628a24ccea0befe726de6e2b32176ddf208", "tree": "80b7de0359644cc3b961bc848460e6dcbd2cf939", "parents": [ "dfd90c8052a913ed2bbbea1873ee51838d40bfe1", "25bab830af062dcaef6f75220066b221fd30957e" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Thu Mar 20 13:00:07 2014 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Mar 20 13:00:07 2014 -0700" }, "message": "am 25bab830: Fix build\n\n* commit \u002725bab830af062dcaef6f75220066b221fd30957e\u0027:\n Fix build\n" }, { "commit": "25bab830af062dcaef6f75220066b221fd30957e", "tree": "3d4b7cc83a843df86fab1080596eddb13016cff6", "parents": [ "d434944b00cf83a38019047e0d7db155a15d77f4" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Thu Mar 20 12:32:48 2014 -0700" }, "committer": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Thu Mar 20 12:32:48 2014 -0700" }, "message": "Fix build\n\nAs of jb-mr1, need to explicitly include library dependencies. The original\nchange in jb, which the automerger dutyfully merged, did not need this.\n\nChange-Id: I429637e2d01b8084376bb97a02bb091a0ea9eaf7\n" }, { "commit": "6f65db14e310b513c8943b236a6e61cf27cef4c7", "tree": "2a04fb4a673c20e6ffb26af36c886ef2e8d730ee", "parents": [ "27ae268af29b25d85f83aa34e92ac8b7f6c87c6f", "0e0891f8b49f31e6a28b563f86aae537e66bb6e0" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Thu Mar 20 11:08:43 2014 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Mar 20 11:08:43 2014 -0700" }, "message": "am 0e0891f8: am 6cdc90b5: am ebc9b473: am fb49b8ba: am dfd90c80: am d434944b: am 3bc4f7ea: am 0c271b75: Verify certificates\n\n* commit \u00270e0891f8b49f31e6a28b563f86aae537e66bb6e0\u0027:\n Verify certificates\n" }, { "commit": "0e0891f8b49f31e6a28b563f86aae537e66bb6e0", "tree": "e362e6c968f6db985c142e31744ffc61ad301d17", "parents": [ "00cb884fc870aba4052c8d187a45e4aec50a6b43", "6cdc90b5e41374dd665df3ae7283ef0c1f532678" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Thu Mar 20 10:49:15 2014 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Mar 20 10:49:15 2014 -0700" }, "message": "am 6cdc90b5: am ebc9b473: am fb49b8ba: am dfd90c80: am d434944b: am 3bc4f7ea: am 0c271b75: Verify certificates\n\n* commit \u00276cdc90b5e41374dd665df3ae7283ef0c1f532678\u0027:\n Verify certificates\n" }, { "commit": "6cdc90b5e41374dd665df3ae7283ef0c1f532678", "tree": "203fce295e8441957dc42d56c8358e622a1a157a", "parents": [ "31d49615007372621ac3fba55e9e3aab48c873f9", "ebc9b47330ab8565f7bdd9b3973a8f75e3206e77" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Thu Mar 20 10:31:32 2014 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Mar 20 10:31:32 2014 -0700" }, "message": "am ebc9b473: am fb49b8ba: am dfd90c80: am d434944b: am 3bc4f7ea: am 0c271b75: Verify certificates\n\n* commit \u0027ebc9b47330ab8565f7bdd9b3973a8f75e3206e77\u0027:\n Verify certificates\n" }, { "commit": "ebc9b47330ab8565f7bdd9b3973a8f75e3206e77", "tree": "a79d6dddf8862a80408905f7e24741632376f9df", "parents": [ "27b876d4cf78b262854b9f2aec26467f9323d3ad", "fb49b8bad468db591f55a7064181372f02ad94a2" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Thu Mar 20 10:27:04 2014 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Mar 20 10:27:04 2014 -0700" }, "message": "am fb49b8ba: am dfd90c80: am d434944b: am 3bc4f7ea: am 0c271b75: Verify certificates\n\n* commit \u0027fb49b8bad468db591f55a7064181372f02ad94a2\u0027:\n Verify certificates\n" }, { "commit": "fb49b8bad468db591f55a7064181372f02ad94a2", "tree": "61b9f60e8d12c6d5d2891dc5055af49aa00f3bc6", "parents": [ "9bc40a2cfdd307074ef5c23ad444fc8a782bab84", "dfd90c8052a913ed2bbbea1873ee51838d40bfe1" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Thu Mar 20 10:21:14 2014 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Mar 20 10:21:14 2014 -0700" }, "message": "am dfd90c80: am d434944b: am 3bc4f7ea: am 0c271b75: Verify certificates\n\n* commit \u0027dfd90c8052a913ed2bbbea1873ee51838d40bfe1\u0027:\n Verify certificates\n" }, { "commit": "dfd90c8052a913ed2bbbea1873ee51838d40bfe1", "tree": "61b9f60e8d12c6d5d2891dc5055af49aa00f3bc6", "parents": [ "98603acbce87c3a451c8e4c26625048363c3f7f7", "d434944b00cf83a38019047e0d7db155a15d77f4" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Thu Mar 20 10:16:53 2014 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Mar 20 10:16:53 2014 -0700" }, "message": "am d434944b: am 3bc4f7ea: am 0c271b75: Verify certificates\n\n* commit \u0027d434944b00cf83a38019047e0d7db155a15d77f4\u0027:\n Verify certificates\n" }, { "commit": "d434944b00cf83a38019047e0d7db155a15d77f4", "tree": "ad223a08bff12a7cf83dc4804af6cba9abb6d6cd", "parents": [ "36337f8f1c4d7384cb1528205582148c85c69f4d", "3bc4f7eaf063201dc85ecc2f7c2bf2b70ab564ed" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Thu Mar 20 10:11:20 2014 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Mar 20 10:11:20 2014 -0700" }, "message": "am 3bc4f7ea: am 0c271b75: Verify certificates\n\n* commit \u00273bc4f7eaf063201dc85ecc2f7c2bf2b70ab564ed\u0027:\n Verify certificates\n" }, { "commit": "3bc4f7eaf063201dc85ecc2f7c2bf2b70ab564ed", "tree": "474128b1314cd7deee61dac6997d68a22d5f2a22", "parents": [ "7d72965ff6a4bf9f91213fbdafcd12cfad8334e5", "0c271b750f7314e187f8479f478ad9382d9a9045" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Thu Mar 20 10:04:18 2014 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Mar 20 10:04:18 2014 -0700" }, "message": "am 0c271b75: Verify certificates\n\n* commit \u00270c271b750f7314e187f8479f478ad9382d9a9045\u0027:\n Verify certificates\n" }, { "commit": "0c271b750f7314e187f8479f478ad9382d9a9045", "tree": "6a605bc71ee0e29300f0acf8494d983473a92207", "parents": [ "6047633622328711cc6b23667c8d6381bae179bf" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Thu Mar 13 14:18:25 2014 -0700" }, "committer": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Wed Mar 19 09:58:37 2014 -0700" }, "message": "Verify certificates\n\nb/13418320\n\nCherrypicked from 8a57d24c733b08da846b54d1adf029e606b5a5f3\nhttps://googleplex-android-review.git.corp.google.com/#/c/433309/\n\nChange-Id: I3052dd5f9ec057e700784cd713f6a7dab9ecfe7b\n" }, { "commit": "27ae268af29b25d85f83aa34e92ac8b7f6c87c6f", "tree": "bd8c35e884f5cfd73ab77cb04ca421e5fd1b2432", "parents": [ "29d060155e2c3e838fcadf303fcf2d1ecfb78710", "00cb884fc870aba4052c8d187a45e4aec50a6b43" ], "author": { "name": "Adam Hampson", "email": "ahampson@google.com", "time": "Wed Nov 13 09:21:33 2013 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Nov 13 09:21:33 2013 -0800" }, "message": "am 00cb884f: Merge \"StageFright: Removes hacks for Nvidia MPEG2 decoder\" into jb-mr2-dev\n\n* commit \u002700cb884fc870aba4052c8d187a45e4aec50a6b43\u0027:\n StageFright: Removes hacks for Nvidia MPEG2 decoder\n" }, { "commit": "00cb884fc870aba4052c8d187a45e4aec50a6b43", "tree": "cfd33b99ae5fe7f53322e02d5e545d7266130600", "parents": [ "6e3ee310d90e30c928c9e29a4a07de4bcbf2855e", "34242ac93467fc364bec435bf961283cd3d6ba0b" ], "author": { "name": "Adam Hampson", "email": "ahampson@google.com", "time": "Wed Nov 13 17:14:31 2013 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Nov 13 17:14:31 2013 +0000" }, "message": "Merge \"StageFright: Removes hacks for Nvidia MPEG2 decoder\" into jb-mr2-dev" }, { "commit": "29d060155e2c3e838fcadf303fcf2d1ecfb78710", "tree": "9f9ef3a5988ed9f0db4a09cb3a117c35f7cd2126", "parents": [ "bcd86896e486e303d285e13477e0623b2a920e78", "6e3ee310d90e30c928c9e29a4a07de4bcbf2855e" ], "author": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Mon Aug 19 14:45:56 2013 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Aug 19 14:45:56 2013 -0700" }, "message": "am 6e3ee310: am 31d49615: am 27b876d4: am 9bc40a2c: am 98603acb: am 36337f8f: am 7d72965f: am 60476336: Remove obsolete drm manager code\n\n* commit \u00276e3ee310d90e30c928c9e29a4a07de4bcbf2855e\u0027:\n Remove obsolete drm manager code\n" }, { "commit": "6e3ee310d90e30c928c9e29a4a07de4bcbf2855e", "tree": "ea742a9faaba650da020a11f332ffc36f8e1217b", "parents": [ "46910bdc57c35ac36bd4adcbb76f4f3a590e3f21", "31d49615007372621ac3fba55e9e3aab48c873f9" ], "author": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Mon Aug 19 14:39:15 2013 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Aug 19 14:39:15 2013 -0700" }, "message": "am 31d49615: am 27b876d4: am 9bc40a2c: am 98603acb: am 36337f8f: am 7d72965f: am 60476336: Remove obsolete drm manager code\n\n* commit \u002731d49615007372621ac3fba55e9e3aab48c873f9\u0027:\n Remove obsolete drm manager code\n" }, { "commit": "31d49615007372621ac3fba55e9e3aab48c873f9", "tree": "1eb70417348d3f54456f992ddc50dd951b0b834a", "parents": [ "72c324efd5a0f632d8f2b57b9f587a540d809b82", "27b876d4cf78b262854b9f2aec26467f9323d3ad" ], "author": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Mon Aug 19 14:36:05 2013 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Aug 19 14:36:05 2013 -0700" }, "message": "am 27b876d4: am 9bc40a2c: am 98603acb: am 36337f8f: am 7d72965f: am 60476336: Remove obsolete drm manager code\n\n* commit \u002727b876d4cf78b262854b9f2aec26467f9323d3ad\u0027:\n Remove obsolete drm manager code\n" }, { "commit": "27b876d4cf78b262854b9f2aec26467f9323d3ad", "tree": "5123ceb89dec155c95d0af3d08450a1db83879f4", "parents": [ "0fe40641db3759088edc1bc7f0182556d77bede6", "9bc40a2cfdd307074ef5c23ad444fc8a782bab84" ], "author": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Mon Aug 19 14:32:42 2013 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Aug 19 14:32:42 2013 -0700" }, "message": "am 9bc40a2c: am 98603acb: am 36337f8f: am 7d72965f: am 60476336: Remove obsolete drm manager code\n\n* commit \u00279bc40a2cfdd307074ef5c23ad444fc8a782bab84\u0027:\n Remove obsolete drm manager code\n" }, { "commit": "9bc40a2cfdd307074ef5c23ad444fc8a782bab84", "tree": "abdeb096f5fcbdc484c5cdf846ec725f42ea0cb5", "parents": [ "72c7cf9d13f5a51a71dccc6d94317727bd0feec3", "98603acbce87c3a451c8e4c26625048363c3f7f7" ], "author": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Mon Aug 19 14:31:11 2013 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Aug 19 14:31:11 2013 -0700" }, "message": "am 98603acb: am 36337f8f: am 7d72965f: am 60476336: Remove obsolete drm manager code\n\n* commit \u002798603acbce87c3a451c8e4c26625048363c3f7f7\u0027:\n Remove obsolete drm manager code\n" }, { "commit": "98603acbce87c3a451c8e4c26625048363c3f7f7", "tree": "abdeb096f5fcbdc484c5cdf846ec725f42ea0cb5", "parents": [ "a1b1e2de67ed5ed3dfa8c8e9554bb0f0ab18a71c", "36337f8f1c4d7384cb1528205582148c85c69f4d" ], "author": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Mon Aug 19 14:27:45 2013 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Aug 19 14:27:45 2013 -0700" }, "message": "am 36337f8f: am 7d72965f: am 60476336: Remove obsolete drm manager code\n\n* commit \u002736337f8f1c4d7384cb1528205582148c85c69f4d\u0027:\n Remove obsolete drm manager code\n" }, { "commit": "36337f8f1c4d7384cb1528205582148c85c69f4d", "tree": "f15224d638d6477ce05b9323d0d812702a476a26", "parents": [ "56f387a4a8f319f3e6080b5e5963a4b177053cbe", "7d72965ff6a4bf9f91213fbdafcd12cfad8334e5" ], "author": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Mon Aug 19 14:24:50 2013 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Aug 19 14:24:50 2013 -0700" }, "message": "am 7d72965f: am 60476336: Remove obsolete drm manager code\n\n* commit \u00277d72965ff6a4bf9f91213fbdafcd12cfad8334e5\u0027:\n Remove obsolete drm manager code\n" }, { "commit": "7d72965ff6a4bf9f91213fbdafcd12cfad8334e5", "tree": "0d4639e25175f272da4033280f7b4ea1cc5165fe", "parents": [ "a923dd4e6c14f5cba2fc5f6f152619ec6bc70c5d", "6047633622328711cc6b23667c8d6381bae179bf" ], "author": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Mon Aug 19 14:21:48 2013 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Aug 19 14:21:48 2013 -0700" }, "message": "am 60476336: Remove obsolete drm manager code\n\n* commit \u00276047633622328711cc6b23667c8d6381bae179bf\u0027:\n Remove obsolete drm manager code\n" }, { "commit": "6047633622328711cc6b23667c8d6381bae179bf", "tree": "39d1be5a435d43627c1f0b174d01cb1152c61f11", "parents": [ "65e8d62a5b243518795cdafa498df4a49baf6940" ], "author": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Mon Jul 22 15:54:42 2013 -0700" }, "committer": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Fri Aug 16 19:17:14 2013 +0000" }, "message": "Remove obsolete drm manager code\n\nbug: 9545965\nChange-Id: Ia6e09efa826b1349d027045e782980daeb7d7596\n(cherry picked from commit f355f18aa2cc1706761e373fe19298a9ccc9c75a)" }, { "commit": "34242ac93467fc364bec435bf961283cd3d6ba0b", "tree": "9ce8d53e1c4645f1e20f78e94b721d7354c03c93", "parents": [ "46910bdc57c35ac36bd4adcbb76f4f3a590e3f21" ], "author": { "name": "Suresh Choudhary", "email": "sureshc@nvidia.com", "time": "Tue Jul 30 19:00:10 2013 +0530" }, "committer": { "name": "Adam Hampson", "email": "ahampson@google.com", "time": "Fri Aug 09 13:36:15 2013 -0700" }, "message": "StageFright: Removes hacks for Nvidia MPEG2 decoder\n\nRemoves the NVIDIA MPEG2 decoder specific hacks in legacy code as\nNvidia HW MPEG2 decoder is enabled and tested now.\n\nChange-Id: Ifc67e1119d9741551336753f85f9cfdfd3fc8600\n" }, { "commit": "bcd86896e486e303d285e13477e0623b2a920e78", "tree": "39039a3156e7e44297c5c6159138c5890ae5a756", "parents": [ "6d4d879037a495f9a4276a6996d1845594ce9090", "d0f5664abb5a8d94ae13f63a5f3491b47383ee2f" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Thu Aug 08 08:56:37 2013 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Aug 08 08:56:37 2013 -0700" }, "message": "am d0f5664a: Merge \"Handle undefined NAL type for h264 streaming\"\n\n* commit \u0027d0f5664abb5a8d94ae13f63a5f3491b47383ee2f\u0027:\n Handle undefined NAL type for h264 streaming\n" }, { "commit": "d0f5664abb5a8d94ae13f63a5f3491b47383ee2f", "tree": "cfd1f8e07656fe523b22ef3d7a31d38e42bbf422", "parents": [ "b687ff9f2e02790e8a8e3964cb73e87546cd72dd", "a355bb4f5ce39a77d05f62263d4be888e903c4cd" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Thu Aug 08 15:52:47 2013 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Thu Aug 08 15:52:48 2013 +0000" }, "message": "Merge \"Handle undefined NAL type for h264 streaming\"" }, { "commit": "6d4d879037a495f9a4276a6996d1845594ce9090", "tree": "1568f08d63b37c6554771642ba7f8f17b11c2a4a", "parents": [ "b57fb786a32d4ea78cd8bbf24a65593353d87a88", "b687ff9f2e02790e8a8e3964cb73e87546cd72dd" ], "author": { "name": "Glenn Kasten", "email": "gkasten@android.com", "time": "Thu Aug 01 12:43:55 2013 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Aug 01 12:43:55 2013 -0700" }, "message": "am b687ff9f: Merge \"Fix mismatched delete/new couple\"\n\n* commit \u0027b687ff9f2e02790e8a8e3964cb73e87546cd72dd\u0027:\n Fix mismatched delete/new couple\n" }, { "commit": "b687ff9f2e02790e8a8e3964cb73e87546cd72dd", "tree": "89581f56db6f3468fae334b1de81a23488aa48e5", "parents": [ "d0ef1ccd987e650e025b840e72f91770d03a5110", "eb144bbbd0b18427562b0d7db5b38e11f9484739" ], "author": { "name": "Glenn Kasten", "email": "gkasten@android.com", "time": "Thu Aug 01 19:37:52 2013 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Thu Aug 01 19:37:52 2013 +0000" }, "message": "Merge \"Fix mismatched delete/new couple\"" }, { "commit": "b57fb786a32d4ea78cd8bbf24a65593353d87a88", "tree": "5cd5927f4d025cf98bdf9c0d616fd6388752fa0a", "parents": [ "f2d744d9535ca59be6cd878830176f81a0a8fbc6", "d0ef1ccd987e650e025b840e72f91770d03a5110" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Wed Jul 31 08:52:41 2013 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Jul 31 08:52:41 2013 -0700" }, "message": "am d0ef1ccd: Merge \"rtsp handle response line ended with \\\u0027\\n\\\u0027\"\n\n* commit \u0027d0ef1ccd987e650e025b840e72f91770d03a5110\u0027:\n rtsp handle response line ended with \u0027\\n\u0027\n" }, { "commit": "d0ef1ccd987e650e025b840e72f91770d03a5110", "tree": "dba78b1a839d35dd2f32c4a8710f8e2bfeb4fe39", "parents": [ "1bb59258458350af518170558120783bc2f9e61d", "3e3af91f70b20623fa5f3845f26260235c0b212d" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Wed Jul 31 15:43:56 2013 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Wed Jul 31 15:43:56 2013 +0000" }, "message": "Merge \"rtsp handle response line ended with \u0027\\n\u0027\"" }, { "commit": "3e3af91f70b20623fa5f3845f26260235c0b212d", "tree": "dba78b1a839d35dd2f32c4a8710f8e2bfeb4fe39", "parents": [ "1bb59258458350af518170558120783bc2f9e61d" ], "author": { "name": "Yajun Zeng", "email": "beanz@marvell.com", "time": "Tue May 14 10:00:10 2013 +0800" }, "committer": { "name": "Yajun Zeng", "email": "beanz@marvell.com", "time": "Wed Jul 31 11:31:46 2013 +0800" }, "message": "rtsp handle response line ended with \u0027\\n\u0027\n\nChange-Id: I5bfafd3fa2c95083e833da2846556282eada2b02\nSigned-off-by: Yajun Zeng \u003cbeanz@marvell.com\u003e\n" }, { "commit": "eb144bbbd0b18427562b0d7db5b38e11f9484739", "tree": "c9ca9b64b648eef884e088f55c3693c0ddbc9c40", "parents": [ "1bb59258458350af518170558120783bc2f9e61d" ], "author": { "name": "Andrei V. FOMITCHEV", "email": "andreix.fomitchev@intel.com", "time": "Tue Oct 09 11:33:25 2012 +0200" }, "committer": { "name": "David Wagner", "email": "david.wagner@intel.com", "time": "Tue Jul 30 14:42:08 2013 +0200" }, "message": "Fix mismatched delete/new couple\n\nIn RecordThread::readInputParameters(), mRsmpInBuffer is allocated\nwith new[] and should be freed with delete[] instead of delete.\n\nThis error has been found by valgrind.\n\nChange-Id: I2f947abb658a21a7d1e61eebb99270cb37d2d147\nSigned-off-by: Andrei V. FOMITCHEV \u003candreix.fomitchev@intel.com\u003e\nSigned-off-by: David Wagner \u003cdavid.wagner@intel.com\u003e\nSigned-off-by: Jack Ren \u003cjack.ren@intel.com\u003e\nSigned-off-by: Bruce Beare \u003cbruce.j.beare@intel.com\u003e\n" }, { "commit": "a355bb4f5ce39a77d05f62263d4be888e903c4cd", "tree": "c7c34e03d8e6b476aa467ebf3b2a4b5d063555af", "parents": [ "1bb59258458350af518170558120783bc2f9e61d" ], "author": { "name": "Patrik2 Carlsson", "email": "patrik2.carlsson@sonyericsson.com", "time": "Fri Nov 16 16:18:03 2012 +0100" }, "committer": { "name": "Johan Redestig", "email": "johan.redestig@sonymobile.com", "time": "Sat Jul 27 17:48:38 2013 +0000" }, "message": "Handle undefined NAL type for h264 streaming\n\nPackages of undefined NAL type (0) was observed but lead to deleting\nthe subsequent package due to the current assembler implementation.\nIdentifying and ignoring this package without returning an error\nhandles undefined packages without side-effects.\n\nChange-Id: I02e15b8682bee3154b3c4acf82639a28417f0c85\n" }, { "commit": "f2d744d9535ca59be6cd878830176f81a0a8fbc6", "tree": "52196feaa278c3c4933a1d5c973f684ea8e16e08", "parents": [ "b0177ff25e3e620be6ebe1e2c3f645b2f05dd57e", "a0e0adee5fbea1457996b0ac6a4c15bea4c1acb0" ], "author": { "name": "The Android Open Source Project", "email": "initial-contribution@android.com", "time": "Fri Jul 19 14:20:40 2013 -0700" }, "committer": { "name": "The Android Open Source Project", "email": "initial-contribution@android.com", "time": "Fri Jul 19 14:20:40 2013 -0700" }, "message": "Reconcile with jb-mr2-zeroday-release - do not merge\n\nChange-Id: I48e936434971feedd176c2d5eafd0fdf43b75f74\n" }, { "commit": "b0177ff25e3e620be6ebe1e2c3f645b2f05dd57e", "tree": "52196feaa278c3c4933a1d5c973f684ea8e16e08", "parents": [ "1bb59258458350af518170558120783bc2f9e61d", "46910bdc57c35ac36bd4adcbb76f4f3a590e3f21" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Fri Jul 19 13:43:00 2013 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Jul 19 13:43:00 2013 -0700" }, "message": "am 46910bdc: Camera2/3: Fix deadlock when starting recording before preview.\n\n* commit \u002746910bdc57c35ac36bd4adcbb76f4f3a590e3f21\u0027:\n Camera2/3: Fix deadlock when starting recording before preview.\n" }, { "commit": "a0e0adee5fbea1457996b0ac6a4c15bea4c1acb0", "tree": "61f2b1567b83c436650e098f89527ec261a3d9aa", "parents": [ "ba83e61a56e2189fba4be1fe4485ea0ce76a7225" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Thu Jul 18 19:15:17 2013 -0700" }, "committer": { "name": "The Android Automerger", "email": "android-build@google.com", "time": "Thu Jul 18 20:47:54 2013 -0700" }, "message": "Camera2/3: Fix deadlock when starting recording before preview.\n\nMove 3A notification synthesis for HAL3 devices from\nCamera3Device::processCaptureResult to Camera2Client\u0027s\nFrameProcessor. This will ensure that calls to processCaptureResult\nfrom HAL can never block on Camera2Client internal mutexes.\n\nBug: 9923891\nChange-Id: I5184649bf45c0807babe6b8c0e1239e959cd3480\n" }, { "commit": "46910bdc57c35ac36bd4adcbb76f4f3a590e3f21", "tree": "61f2b1567b83c436650e098f89527ec261a3d9aa", "parents": [ "a2520db02bead68d4980783c41500ae96511bdf8" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Thu Jul 18 19:15:17 2013 -0700" }, "committer": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Thu Jul 18 19:36:00 2013 -0700" }, "message": "Camera2/3: Fix deadlock when starting recording before preview.\n\nMove 3A notification synthesis for HAL3 devices from\nCamera3Device::processCaptureResult to Camera2Client\u0027s\nFrameProcessor. This will ensure that calls to processCaptureResult\nfrom HAL can never block on Camera2Client internal mutexes.\n\nBug: 9923891\nChange-Id: I5184649bf45c0807babe6b8c0e1239e959cd3480\n" }, { "commit": "1bb59258458350af518170558120783bc2f9e61d", "tree": "130ea2f4111654771de0807a0ffd2fda5ba92365", "parents": [ "0a95b17c93f8ca0a4ed46bdc5797aa81f46f028c", "ba83e61a56e2189fba4be1fe4485ea0ce76a7225" ], "author": { "name": "The Android Open Source Project", "email": "initial-contribution@android.com", "time": "Wed Jul 10 08:34:46 2013 -0700" }, "committer": { "name": "The Android Open Source Project", "email": "initial-contribution@android.com", "time": "Wed Jul 10 08:34:46 2013 -0700" }, "message": "Reconcile with jb-mr2-zeroday-release - do not merge\n\nChange-Id: Ie4a7e41d8d28b46966f6aadfd38af5516c082f04\n" }, { "commit": "ba83e61a56e2189fba4be1fe4485ea0ce76a7225", "tree": "4700e3363f26d6cc69f6eccbf82db96dc39503f1", "parents": [ "a2520db02bead68d4980783c41500ae96511bdf8", "af06050932e00a03bed7b12c8ac86d90008052f2" ], "author": { "name": "The Android Automerger", "email": "android-build@google.com", "time": "Wed Jul 10 05:55:16 2013 -0700" }, "committer": { "name": "The Android Automerger", "email": "android-build@google.com", "time": "Wed Jul 10 05:55:16 2013 -0700" }, "message": "merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev\n" }, { "commit": "0a95b17c93f8ca0a4ed46bdc5797aa81f46f028c", "tree": "130ea2f4111654771de0807a0ffd2fda5ba92365", "parents": [ "adaa78c901a2f2509965b7acc1cde848dfc6bafe", "af06050932e00a03bed7b12c8ac86d90008052f2" ], "author": { "name": "The Android Open Source Project", "email": "initial-contribution@android.com", "time": "Tue Jul 09 09:37:21 2013 -0700" }, "committer": { "name": "The Android Open Source Project", "email": "initial-contribution@android.com", "time": "Tue Jul 09 09:37:21 2013 -0700" }, "message": "Reconcile with jb-mr2-zeroday-release - do not merge\n\nChange-Id: I9a9eea4a01ba78b06cb79a26db9b0bcb52f5fd7b\n" }, { "commit": "adaa78c901a2f2509965b7acc1cde848dfc6bafe", "tree": "130ea2f4111654771de0807a0ffd2fda5ba92365", "parents": [ "06a4604e77b5872857ef95fe712b6ce00c7aa506", "a2520db02bead68d4980783c41500ae96511bdf8" ], "author": { "name": "Zhijun He", "email": "zhijunhe@google.com", "time": "Tue Jul 09 08:00:35 2013 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Jul 09 08:00:35 2013 -0700" }, "message": "am a2520db0: camera2/3: set preview callback oneshot flag during still capture\n\n* commit \u0027a2520db02bead68d4980783c41500ae96511bdf8\u0027:\n camera2/3: set preview callback oneshot flag during still capture\n" }, { "commit": "af06050932e00a03bed7b12c8ac86d90008052f2", "tree": "08608bdb6a061244b8cb7405a11f3bde8ff12ae7", "parents": [ "4a5c009bc2389304cf078c270bceb656479367d2", "15e5c9f49ad92ce985c9d0c2fe2767df2833b12c" ], "author": { "name": "The Android Automerger", "email": "android-build@google.com", "time": "Tue Jul 09 05:55:21 2013 -0700" }, "committer": { "name": "The Android Automerger", "email": "android-build@google.com", "time": "Tue Jul 09 05:55:21 2013 -0700" }, "message": "merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev\n" }, { "commit": "a2520db02bead68d4980783c41500ae96511bdf8", "tree": "4700e3363f26d6cc69f6eccbf82db96dc39503f1", "parents": [ "4a5c009bc2389304cf078c270bceb656479367d2" ], "author": { "name": "Zhijun He", "email": "zhijunhe@google.com", "time": "Mon Jul 08 16:12:32 2013 -0700" }, "committer": { "name": "Zhijun He", "email": "zhijunhe@google.com", "time": "Mon Jul 08 17:22:16 2013 -0700" }, "message": "camera2/3: set preview callback oneshot flag during still capture\n\nPreview callback oneshot flag need set when a still picture is being captured\nand preview callback oneshot is enabled, otherwise, the callback enabling status\ncould be lost when preview is restarted after still catpure.\n\nBug 9742091\n\nChange-Id: If9562369013e53727edfdd16f3d00d6a9392e70d\n" }, { "commit": "06a4604e77b5872857ef95fe712b6ce00c7aa506", "tree": "1bd43bfc13e12c0e189ceb55e978ff0fb6db0974", "parents": [ "291967728b02ad9a7d5545b0eb1ec0c4c3d664af", "4a5c009bc2389304cf078c270bceb656479367d2" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Mon Jul 08 16:47:27 2013 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Jul 08 16:47:27 2013 -0700" }, "message": "am 4a5c009b: Camera2/3: As a fallback, unilaterally free old recording buffers\n\n* commit \u00274a5c009bc2389304cf078c270bceb656479367d2\u0027:\n Camera2/3: As a fallback, unilaterally free old recording buffers\n" }, { "commit": "291967728b02ad9a7d5545b0eb1ec0c4c3d664af", "tree": "1f4bebe3e7480d719ed2431427db16475730558e", "parents": [ "1468dd9cefe11d5938a5497688f99701b6b14706", "15e5c9f49ad92ce985c9d0c2fe2767df2833b12c" ], "author": { "name": "The Android Open Source Project", "email": "initial-contribution@android.com", "time": "Mon Jul 08 15:33:11 2013 -0700" }, "committer": { "name": "The Android Open Source Project", "email": "initial-contribution@android.com", "time": "Mon Jul 08 15:33:11 2013 -0700" }, "message": "Reconcile with jb-mr2-zeroday-release - do not merge\n\nChange-Id: I13e45e13c3abf52cef3fb58de3f4707fb8fedaac\n" }, { "commit": "1468dd9cefe11d5938a5497688f99701b6b14706", "tree": "1f4bebe3e7480d719ed2431427db16475730558e", "parents": [ "8ebdfa8b021ed338f9916a1f30d756b989afa3bd", "c582fde93ded7219107157333a9e46d780adcf9c" ], "author": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Mon Jul 08 13:42:25 2013 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Jul 08 13:42:25 2013 -0700" }, "message": "am c582fde9: resolved conflicts for merge of c158971f to stage-aosp-master\n\n* commit \u0027c582fde93ded7219107157333a9e46d780adcf9c\u0027:\n Store rtsp accessunit until PLAY response parsed\n" }, { "commit": "c582fde93ded7219107157333a9e46d780adcf9c", "tree": "f160b266ecfa9eef394f1ba7755f9e5bac422fd0", "parents": [ "5de9ef20d596bc20f53cba664f1ac7e358910ea2", "c158971f13ea4f496dc7836c698f1220fa4e4bba" ], "author": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Mon Jul 08 13:36:08 2013 -0700" }, "committer": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Mon Jul 08 13:36:08 2013 -0700" }, "message": "resolved conflicts for merge of c158971f to stage-aosp-master\n\nChange-Id: I3d77b86f7e616af62a826fc37126706ad8ff6158\n" }, { "commit": "4a5c009bc2389304cf078c270bceb656479367d2", "tree": "08608bdb6a061244b8cb7405a11f3bde8ff12ae7", "parents": [ "eced745af7d2d27a8c45e04eb071d4fb30cd3e48" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Wed Jul 03 16:56:11 2013 -0700" }, "committer": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Mon Jul 08 13:12:10 2013 -0700" }, "message": "Camera2/3: As a fallback, unilaterally free old recording buffers\n\nWhen starting a recording session, check for and clear out recording\nbuffers still owned by stagefright from a previous recording session,\nif any. There should never be any, but in case they are due to a bug\nelsewhere in the system, clearing out the buffers makes recovery\npossible.\n\nBug: 9591080\nChange-Id: I3a2a1256860bd174381cd525948419f985c9b415\n" }, { "commit": "c158971f13ea4f496dc7836c698f1220fa4e4bba", "tree": "a302e54672cb84f5f8906670cf4f8a5cbfdf00af", "parents": [ "365ed394c4135d9d42082c85638c076aed4bd156", "bbbf9c4552402ab18b255f4058e9e6e506f3f106" ], "author": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Mon Jul 08 19:35:13 2013 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Mon Jul 08 19:35:13 2013 +0000" }, "message": "Merge \"Store rtsp accessunit until PLAY response parsed\"" }, { "commit": "8ebdfa8b021ed338f9916a1f30d756b989afa3bd", "tree": "61a4c5ce548145dd0fe1409ecd2d95f359b42edb", "parents": [ "c26ab375ebb1bce6c3a99a46a72d8369170255ca", "5de9ef20d596bc20f53cba664f1ac7e358910ea2" ], "author": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Mon Jul 08 12:20:16 2013 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Jul 08 12:20:16 2013 -0700" }, "message": "am 5de9ef20: am 365ed394: Merge \"Typo in CameraParameters::set\"\n\n* commit \u00275de9ef20d596bc20f53cba664f1ac7e358910ea2\u0027:\n Typo in CameraParameters::set\n" }, { "commit": "5de9ef20d596bc20f53cba664f1ac7e358910ea2", "tree": "ed66ac85621e0d2aa6e885540aee671cefa73b02", "parents": [ "5d2ab2a6d5e90c045d0989ef1be6c66a2295ee2d", "365ed394c4135d9d42082c85638c076aed4bd156" ], "author": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Mon Jul 08 12:15:36 2013 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Jul 08 12:15:36 2013 -0700" }, "message": "am 365ed394: Merge \"Typo in CameraParameters::set\"\n\n* commit \u0027365ed394c4135d9d42082c85638c076aed4bd156\u0027:\n Typo in CameraParameters::set\n" }, { "commit": "365ed394c4135d9d42082c85638c076aed4bd156", "tree": "d6a60649001b824ee9f23846492e0e85e16fdecb", "parents": [ "8eef093c213094c7efb655ef4d9e31439646bd7f", "4c18eb30b493a4cd8d56bbcf8acb526b97c401a4" ], "author": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Mon Jul 08 19:00:51 2013 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Mon Jul 08 19:00:57 2013 +0000" }, "message": "Merge \"Typo in CameraParameters::set\"" }, { "commit": "c26ab375ebb1bce6c3a99a46a72d8369170255ca", "tree": "b9bf6363d011a4c4f7e3a193ab3f286767719832", "parents": [ "046d9c8dad97118535778cf93efc662ceb5fec8d", "5d2ab2a6d5e90c045d0989ef1be6c66a2295ee2d" ], "author": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Mon Jul 08 11:29:15 2013 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Jul 08 11:29:15 2013 -0700" }, "message": "am 5d2ab2a6: am 8eef093c: Merge \"libstagefright: Use LOG_BASIC when use chromium http stack\"\n\n* commit \u00275d2ab2a6d5e90c045d0989ef1be6c66a2295ee2d\u0027:\n libstagefright: Use LOG_BASIC when use chromium http stack\n" }, { "commit": "046d9c8dad97118535778cf93efc662ceb5fec8d", "tree": "ac8d2ad8ad65d9d9812b20f209bbc47be6b43f64", "parents": [ "9f0e05978e236352fd2a4a7c6dce909755c36ead", "061979253985e59c4fcb82ede232717736e633b1" ], "author": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Mon Jul 08 11:25:40 2013 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Jul 08 11:25:40 2013 -0700" }, "message": "am 06197925: am 267363ee: Merge \"Prevent Media Server crash while the AwesomePlayer getBitrate return true with mBitrate equals to zero.\"\n\n* commit \u0027061979253985e59c4fcb82ede232717736e633b1\u0027:\n Prevent Media Server crash while the AwesomePlayer getBitrate return true with mBitrate equals to zero.\n" }, { "commit": "5d2ab2a6d5e90c045d0989ef1be6c66a2295ee2d", "tree": "82db445e4950d59cbdc185dcda1606c5a345ddbe", "parents": [ "061979253985e59c4fcb82ede232717736e633b1", "8eef093c213094c7efb655ef4d9e31439646bd7f" ], "author": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Mon Jul 08 11:25:39 2013 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Jul 08 11:25:39 2013 -0700" }, "message": "am 8eef093c: Merge \"libstagefright: Use LOG_BASIC when use chromium http stack\"\n\n* commit \u00278eef093c213094c7efb655ef4d9e31439646bd7f\u0027:\n libstagefright: Use LOG_BASIC when use chromium http stack\n" }, { "commit": "9f0e05978e236352fd2a4a7c6dce909755c36ead", "tree": "539b172729d0a44025e5331c7a2fda6b1f86d0ae", "parents": [ "9a25c012915f2209fff1479b246ae8eba38c3eff", "7266bc80850dc327e9f18c27b81613f959399630" ], "author": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Mon Jul 08 11:25:34 2013 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Jul 08 11:25:34 2013 -0700" }, "message": "am 7266bc80: am ca7f1609: Merge \"Prevent double disconnects in RTSPSource\"\n\n* commit \u00277266bc80850dc327e9f18c27b81613f959399630\u0027:\n Prevent double disconnects in RTSPSource\n" }, { "commit": "8eef093c213094c7efb655ef4d9e31439646bd7f", "tree": "ccaa3bfa58530e0bf7f5cbc55df46febb4622d47", "parents": [ "267363ee2836ff9bc18d7fdd93aaedf19de546ad", "300df42a7f51f2666d7ef4e73ac04101bbbb11bb" ], "author": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Mon Jul 08 18:23:45 2013 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Mon Jul 08 18:23:45 2013 +0000" }, "message": "Merge \"libstagefright: Use LOG_BASIC when use chromium http stack\"" }, { "commit": "061979253985e59c4fcb82ede232717736e633b1", "tree": "39e6d96715dfe7f032d7eeb843ee71b0d3c638bc", "parents": [ "7266bc80850dc327e9f18c27b81613f959399630", "267363ee2836ff9bc18d7fdd93aaedf19de546ad" ], "author": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Mon Jul 08 11:21:48 2013 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Jul 08 11:21:48 2013 -0700" }, "message": "am 267363ee: Merge \"Prevent Media Server crash while the AwesomePlayer getBitrate return true with mBitrate equals to zero.\"\n\n* commit \u0027267363ee2836ff9bc18d7fdd93aaedf19de546ad\u0027:\n Prevent Media Server crash while the AwesomePlayer getBitrate return true with mBitrate equals to zero.\n" }, { "commit": "7266bc80850dc327e9f18c27b81613f959399630", "tree": "661b92b78a01707e05a62323b286132f8714b02f", "parents": [ "47a1fe04637793f48d808261b1fac47acc3de1e1", "ca7f160921a4a1a5da32ebe8fab1067bd8998a1f" ], "author": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Mon Jul 08 11:21:45 2013 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Jul 08 11:21:45 2013 -0700" }, "message": "am ca7f1609: Merge \"Prevent double disconnects in RTSPSource\"\n\n* commit \u0027ca7f160921a4a1a5da32ebe8fab1067bd8998a1f\u0027:\n Prevent double disconnects in RTSPSource\n" }, { "commit": "267363ee2836ff9bc18d7fdd93aaedf19de546ad", "tree": "7f62b3fa90d6c6ba4de1e2f45305c3f520e3ecf4", "parents": [ "ca7f160921a4a1a5da32ebe8fab1067bd8998a1f", "b9b8d14d89019ba7b9d183f0fbad2af924a0cd95" ], "author": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Mon Jul 08 18:17:43 2013 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Mon Jul 08 18:17:43 2013 +0000" }, "message": "Merge \"Prevent Media Server crash while the AwesomePlayer getBitrate return true with mBitrate equals to zero.\"" }, { "commit": "ca7f160921a4a1a5da32ebe8fab1067bd8998a1f", "tree": "86eba1233c510ecc2217ae7d49c1780834d87c6e", "parents": [ "a9aa6baa5d86fc1a5bd37fc636d766d9e3ad2507", "0ad03bc59d090a0455f858d2f629834c105f6f37" ], "author": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Mon Jul 08 18:17:02 2013 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Mon Jul 08 18:17:03 2013 +0000" }, "message": "Merge \"Prevent double disconnects in RTSPSource\"" }, { "commit": "15e5c9f49ad92ce985c9d0c2fe2767df2833b12c", "tree": "6c0f3fb81cacec3e1a2762d7c360a1446f8a61b7", "parents": [ "eced745af7d2d27a8c45e04eb071d4fb30cd3e48", "fc99165001048eac94aefbf29bcae5071493d484" ], "author": { "name": "The Android Automerger", "email": "android-build@google.com", "time": "Mon Jul 08 05:55:23 2013 -0700" }, "committer": { "name": "The Android Automerger", "email": "android-build@google.com", "time": "Mon Jul 08 05:55:23 2013 -0700" }, "message": "merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev\n" }, { "commit": "9a25c012915f2209fff1479b246ae8eba38c3eff", "tree": "af538ebd502f0d834f5e9a10799f3e508bdfa55b", "parents": [ "ace2378c934b61fbd865b5ade9ff7d0df81dabe3", "eced745af7d2d27a8c45e04eb071d4fb30cd3e48" ], "author": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Sun Jul 07 12:26:16 2013 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Sun Jul 07 12:26:16 2013 -0700" }, "message": "am eced745a: Merge \"Part of fix for TEE resource leaks when app crashes\" into jb-mr2-dev\n\n* commit \u0027eced745af7d2d27a8c45e04eb071d4fb30cd3e48\u0027:\n Part of fix for TEE resource leaks when app crashes\n" }, { "commit": "eced745af7d2d27a8c45e04eb071d4fb30cd3e48", "tree": "6c0f3fb81cacec3e1a2762d7c360a1446f8a61b7", "parents": [ "f59a4b393f4844c5bbc8d6212364bdddea33d232", "3d3f67f3afa45e6b49d85b20942ee8184a33c1a4" ], "author": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Sun Jul 07 19:21:55 2013 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Sun Jul 07 19:21:56 2013 +0000" }, "message": "Merge \"Part of fix for TEE resource leaks when app crashes\" into jb-mr2-dev" }, { "commit": "3d3f67f3afa45e6b49d85b20942ee8184a33c1a4", "tree": "ecf87485ed6235279de2022c056c0f370b2af8d5", "parents": [ "a691ff3c03e38e148bbefed35ebb15e552a12613" ], "author": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Wed Jul 03 15:38:58 2013 -0700" }, "committer": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Wed Jul 03 16:23:39 2013 -0700" }, "message": "Part of fix for TEE resource leaks when app crashes\n\nbug: 9672606\nChange-Id: I98cf65260d5e43d34e3897452f6f26ed2c89294e\n" }, { "commit": "ace2378c934b61fbd865b5ade9ff7d0df81dabe3", "tree": "b3146af4726c4a98a245e58ad1941fb7844c6418", "parents": [ "f64bd473e4c500dc54923baac7261e6d2d72daa6", "f59a4b393f4844c5bbc8d6212364bdddea33d232" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Wed Jul 03 08:16:46 2013 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Jul 03 08:16:46 2013 -0700" }, "message": "am f59a4b39: fix scheduling policy service death detection\n\n* commit \u0027f59a4b393f4844c5bbc8d6212364bdddea33d232\u0027:\n fix scheduling policy service death detection\n" }, { "commit": "b9b8d14d89019ba7b9d183f0fbad2af924a0cd95", "tree": "cc5f9c3451e2a232932b4a52c46ba26dfefebd96", "parents": [ "a9aa6baa5d86fc1a5bd37fc636d766d9e3ad2507" ], "author": { "name": "hovanchen", "email": "hovanchen@fihspec.com", "time": "Tue Jul 02 15:07:44 2013 +0800" }, "committer": { "name": "Cheng-Hao Chen", "email": "hovanchen@fihspec.com", "time": "Wed Jul 03 01:15:59 2013 +0000" }, "message": "Prevent Media Server crash while the AwesomePlayer getBitrate return true with mBitrate equals to zero.\n\n[Cause]\n - getBitrate(int64_t *bitrate) will return true if mBitrate \u003d 0.\n - Then, in getCachedDuration_l(int64_t *durationUs, bool *eos), \n we might execute the following function when \n getBitrate(\u0026bitrate) \u003d true and bitrate \u003d 0.\n *durationUs \u003d cachedDataRemaining * 8000000ll / bitrate;\n - Mediaserver will be crashed when divided by zero.\n - The mediaserver crash often occur when DLNA IOP tests on Golden DMS\n with AAC_ADTS_320 audio.\n[Solution]\n - Prevent the divide function executing when bitrate is zero.\n\nChange-Id: I4439d92cee5faec95df2109e9186c33b3fff6c66\n" }, { "commit": "f59a4b393f4844c5bbc8d6212364bdddea33d232", "tree": "50a7dc8e5ac254ca4f6a40d84980713a8ac30599", "parents": [ "a691ff3c03e38e148bbefed35ebb15e552a12613" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Tue Jul 02 11:15:41 2013 -0700" }, "committer": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Tue Jul 02 12:15:10 2013 -0700" }, "message": "fix scheduling policy service death detection\n\nCheck status of transactions to scheduling policy service\nand re-acquire a binder interface in case of DEAD_OBJECT.\n\nBug: 8875559.\nChange-Id: I1e00bd44e2d4723b3ec95d5c31d9652ba08e238a\n" }, { "commit": "f64bd473e4c500dc54923baac7261e6d2d72daa6", "tree": "39fe6bd6d01054e9923e1a167eb826b3f564e387", "parents": [ "0eefffd8fc8abfbe694814fcec397aeac3f545b8", "1b88b416440786a09519d0b94884149d46ca4438", "fc99165001048eac94aefbf29bcae5071493d484" ], "author": { "name": "The Android Open Source Project", "email": "initial-contribution@android.com", "time": "Mon Jul 01 07:42:56 2013 -0700" }, "committer": { "name": "The Android Open Source Project", "email": "initial-contribution@android.com", "time": "Mon Jul 01 07:42:56 2013 -0700" }, "message": "Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge\n\nChange-Id: Idf0f0cdf02e6e94603ff003b6baf869b4414e1cf\n" }, { "commit": "0ad03bc59d090a0455f858d2f629834c105f6f37", "tree": "86eba1233c510ecc2217ae7d49c1780834d87c6e", "parents": [ "a9aa6baa5d86fc1a5bd37fc636d766d9e3ad2507" ], "author": { "name": "Fredrik Rosin", "email": "fredrik.rosin@sonymobile.com", "time": "Wed Mar 06 13:42:53 2013 +0100" }, "committer": { "name": "Henrik Baard", "email": "henrik.baard@sonymobile.com", "time": "Mon Jul 01 13:14:47 2013 +0200" }, "message": "Prevent double disconnects in RTSPSource\n\nPrevent a null pointer from occuring by checking that we are not\nalready disconnected before performing a disconnect, in case\nmultiple disconnects have been issued.\n\nChange-Id: Ib88800cd246086fd57f77d10748d41b1aefe2084\n" }, { "commit": "fc99165001048eac94aefbf29bcae5071493d484", "tree": "e40a419e636ccc48551c5810887e872b5ac9ee44", "parents": [ "a691ff3c03e38e148bbefed35ebb15e552a12613", "31484d8d90e4861a848ce4f2fbbc1ddeac8d0a87" ], "author": { "name": "The Android Automerger", "email": "android-build@google.com", "time": "Sun Jun 30 05:55:22 2013 -0700" }, "committer": { "name": "The Android Automerger", "email": "android-build@google.com", "time": "Sun Jun 30 05:55:22 2013 -0700" }, "message": "merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev\n" }, { "commit": "0eefffd8fc8abfbe694814fcec397aeac3f545b8", "tree": "39fe6bd6d01054e9923e1a167eb826b3f564e387", "parents": [ "903871da7a7c71b8718133e60e2f0835837b5f3f", "47a1fe04637793f48d808261b1fac47acc3de1e1" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Fri Jun 28 15:31:37 2013 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Jun 28 15:31:37 2013 -0700" }, "message": "am 47a1fe04: am a9aa6baa: Merge \"Set u.ext_data to null after it has been freed\"\n\n* commit \u002747a1fe04637793f48d808261b1fac47acc3de1e1\u0027:\n Set u.ext_data to null after it has been freed\n" }, { "commit": "47a1fe04637793f48d808261b1fac47acc3de1e1", "tree": "d29e650d5b2a1c0db68681362bb4faa86589a92f", "parents": [ "83790fcce4f5cda1e7c89f1cbed452426502f227", "a9aa6baa5d86fc1a5bd37fc636d766d9e3ad2507" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Fri Jun 28 15:29:01 2013 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Jun 28 15:29:01 2013 -0700" }, "message": "am a9aa6baa: Merge \"Set u.ext_data to null after it has been freed\"\n\n* commit \u0027a9aa6baa5d86fc1a5bd37fc636d766d9e3ad2507\u0027:\n Set u.ext_data to null after it has been freed\n" }, { "commit": "a9aa6baa5d86fc1a5bd37fc636d766d9e3ad2507", "tree": "f8e1cec5cd70058e39131d5c9e4fc16d651eb6fa", "parents": [ "bdf33c98912090176183d3e9b9a9217dbbdca6da", "fca812565cebd229fba8be32bad14983c5252a7b" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Fri Jun 28 22:26:42 2013 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Fri Jun 28 22:26:44 2013 +0000" }, "message": "Merge \"Set u.ext_data to null after it has been freed\"" }, { "commit": "1b88b416440786a09519d0b94884149d46ca4438", "tree": "e0533cc346d68a6109dafa9e92dacbdd60de6a90", "parents": [ "45e306536ff236af59676e7fc213d5ad20be45e2" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Wed May 29 14:20:52 2013 -0700" }, "committer": { "name": "The Android Automerger", "email": "android-build@android.com", "time": "Fri Jun 28 14:38:25 2013 -0700" }, "message": "Update HTTP proxy configuration for all media playback inside stagefright.\n\nChange-Id: Ie0dd00045aba668d8b49da73224e7a7c9c04f69b\nrelated-to-bug: 8873723\n(cherry picked from commit 2704965b8a1ff3b7450ff58ccecf86d8ec688c40)\n" }, { "commit": "903871da7a7c71b8718133e60e2f0835837b5f3f", "tree": "cb092022b30108509b0a7a0103f938da9d262925", "parents": [ "364a2677c862af64f21b41dd3ab1b9e5c68b4ce0", "83790fcce4f5cda1e7c89f1cbed452426502f227" ], "author": { "name": "Glenn Kasten", "email": "gkasten@android.com", "time": "Fri Jun 28 09:33:15 2013 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Jun 28 09:33:15 2013 -0700" }, "message": "am 83790fcc: am bdf33c98: Merge \"Fix compilation warning: incorrect format specifier for type \\\u0027ssize_t\\\u0027.\"\n\n* commit \u002783790fcce4f5cda1e7c89f1cbed452426502f227\u0027:\n Fix compilation warning: incorrect format specifier for type \u0027ssize_t\u0027.\n" }, { "commit": "83790fcce4f5cda1e7c89f1cbed452426502f227", "tree": "c7636bc7a6b9f7597ebe6dcf91a377448e8ec950", "parents": [ "3a4ff0b8bf464c9c286d63326bea42609527051e", "bdf33c98912090176183d3e9b9a9217dbbdca6da" ], "author": { "name": "Glenn Kasten", "email": "gkasten@android.com", "time": "Fri Jun 28 09:30:58 2013 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Jun 28 09:30:58 2013 -0700" }, "message": "am bdf33c98: Merge \"Fix compilation warning: incorrect format specifier for type \\\u0027ssize_t\\\u0027.\"\n\n* commit \u0027bdf33c98912090176183d3e9b9a9217dbbdca6da\u0027:\n Fix compilation warning: incorrect format specifier for type \u0027ssize_t\u0027.\n" }, { "commit": "bdf33c98912090176183d3e9b9a9217dbbdca6da", "tree": "03efbb6dff1fbad998859225e3ae49901211d417", "parents": [ "d74a9ee83fd6e033fd2260ca3777390d7e5f817a", "7d409691ed61f96bac6672b59f368cd3cc8ea2d8" ], "author": { "name": "Glenn Kasten", "email": "gkasten@android.com", "time": "Fri Jun 28 16:28:48 2013 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Fri Jun 28 16:28:49 2013 +0000" }, "message": "Merge \"Fix compilation warning: incorrect format specifier for type \u0027ssize_t\u0027.\"" } ], "next": "364a2677c862af64f21b41dd3ab1b9e5c68b4ce0" }