)]}' { "log": [ { "commit": "6ddd08e3a9be87daa8d7308da5b9b12456257ae5", "tree": "a48d1e0e64039598831f4abbf192b55b5f5668f5", "parents": [ "9986938f083409a8a8d17556c9164b4d89857ce4", "edf9d2f4d1cf858d5546a8f97ea0997c1cea0dda" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Fri Feb 03 00:04:02 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Feb 03 00:04:02 2017 +0000" }, "message": "CameraBase: Don\u0027t return an sp\u003c\u003e by reference am: 4b49489c12 am: 8c32699ceb am: 8806c2a11d am: 99c4dd2fe8 am: dd82ab2377 am: 1dd068cd45\nam: edf9d2f4d1\n\nChange-Id: Iae1d54c6444695074f722fce21e958ed687ef9c7\n" }, { "commit": "edf9d2f4d1cf858d5546a8f97ea0997c1cea0dda", "tree": "c576a2312bd7698aa6595070415e52d8ee0f0123", "parents": [ "90706971240490361b3ed1c68b028b73d6dcce90", "1dd068cd45a9e077c0998774b78a041685d9f2a8" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Fri Feb 03 00:00:02 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Feb 03 00:00:02 2017 +0000" }, "message": "CameraBase: Don\u0027t return an sp\u003c\u003e by reference am: 4b49489c12 am: 8c32699ceb am: 8806c2a11d am: 99c4dd2fe8 am: dd82ab2377\nam: 1dd068cd45\n\nChange-Id: Ie5afd6dc9b89c0dc22a2cef6e0ca6a9921921538\n" }, { "commit": "dd82ab237742b5594f19ac41e0b89ed7e37f007e", "tree": "2cc5991c6416f19d0e229c486126aef3a4f8525c", "parents": [ "bd91a6540defccd060a5a314ce6ed41bcd562577", "99c4dd2fe88e23bfc89f9a28c6f2f1b0704ab95e" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Thu Feb 02 23:54:31 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Feb 02 23:54:31 2017 +0000" }, "message": "CameraBase: Don\u0027t return an sp\u003c\u003e by reference am: 4b49489c12 am: 8c32699ceb am: 8806c2a11d\nam: 99c4dd2fe8\n\nChange-Id: I7fd189d89b4a0ddb91a7f21485d97dabee9b784e\n" }, { "commit": "99c4dd2fe88e23bfc89f9a28c6f2f1b0704ab95e", "tree": "be7e9ccb11a84114c63f963ae618e205d0a65f0e", "parents": [ "4c1ad41c8b1d4da156e2d018000427c9dd1914c3", "8806c2a11dd6e810aeed8b65eeac76fba7c94b94" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Thu Feb 02 23:52:01 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Feb 02 23:52:01 2017 +0000" }, "message": "CameraBase: Don\u0027t return an sp\u003c\u003e by reference am: 4b49489c12 am: 8c32699ceb\nam: 8806c2a11d\n\nChange-Id: I61be9ab0dbd9acde84811cd437304267b9544099\n" }, { "commit": "8806c2a11dd6e810aeed8b65eeac76fba7c94b94", "tree": "ea70dd4b952c548b27325b4a1b7e5d1160a1a7f0", "parents": [ "ce9cab33b7981bcf44072e5c75f2d3818e9bd2cc", "8c32699ceb4fb4d25197c3a5d70ebc3f3f505abc" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Thu Feb 02 23:49:01 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Feb 02 23:49:01 2017 +0000" }, "message": "CameraBase: Don\u0027t return an sp\u003c\u003e by reference am: 4b49489c12\nam: 8c32699ceb\n\nChange-Id: I6fac31b3eaa435a665643343c2a6d8a6959be107\n" }, { "commit": "4b49489c12e6862e9a320ebcb53872e809ed20ec", "tree": "c0e73d122ec6691384ef8f0b16debb3a1c60fdb3", "parents": [ "c2f0c73bfcf36219f446e3eef9effe49a3a415a5" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Wed Feb 01 15:27:41 2017 -0800" }, "committer": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Thu Feb 02 11:40:56 2017 -0800" }, "message": "CameraBase: Don\u0027t return an sp\u003c\u003e by reference\n\nIf the server dies, the binder death callback clears out\nthe global camera service sp\u003c\u003e, and any current references to it\nwill become quite unhappy.\n\nTest: Camera CTS passes\nBug: 31992879\nChange-Id: I2966bed35d0319e3f26e3d4b1b8dc08006a22348\n" }, { "commit": "f043ba10561cb1e8ca0689b1124b82e2606af056", "tree": "402168d4e88581a5f2dd390bec3758cfd7f75154", "parents": [ "7488cb128366f8dc61de954aca6b18e5610a2ad1", "35a9478b27a4cd09ae1206fa6917a74bf2b9eff7" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Tue Sep 13 23:25:53 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Sep 13 23:25:53 2016 +0000" }, "message": "SoundTrigger: get service by value. am: 3b01b3019b am: bd33d5672f am: 9b5b4abd82 am: 4a34d9fcd2\nam: 35a9478b27\n\nChange-Id: I25eef85b5ec1b4f6c4bb4afde0d5960a247030d9\n" }, { "commit": "35a9478b27a4cd09ae1206fa6917a74bf2b9eff7", "tree": "536fb6003da2811d242f23bef8af555bc9b54858", "parents": [ "28a0e9ec74e5192aacffb279c80619ef284062b0", "4a34d9fcd2c6c2bd857d210b6a8156635af4faa3" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Tue Sep 13 23:22:18 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Sep 13 23:22:18 2016 +0000" }, "message": "SoundTrigger: get service by value. am: 3b01b3019b am: bd33d5672f am: 9b5b4abd82\nam: 4a34d9fcd2\n\nChange-Id: I51848846811a770346189dcaed080f2cf350883a\n" }, { "commit": "4a34d9fcd2c6c2bd857d210b6a8156635af4faa3", "tree": "27356fff8b769289d22db0917b4431dc78c5e34b", "parents": [ "f95caa3506c1bb851854b8c5a416790e3b2bb53e", "9b5b4abd824e4eee0d8fcbab51198e46a7b37982" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Tue Sep 13 23:19:09 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Sep 13 23:19:09 2016 +0000" }, "message": "SoundTrigger: get service by value. am: 3b01b3019b am: bd33d5672f\nam: 9b5b4abd82\n\nChange-Id: I2574013b83d43208f07812dd4b3e431805e2a6e3\n" }, { "commit": "7488cb128366f8dc61de954aca6b18e5610a2ad1", "tree": "044bc397de9a9deb75baae06d862e05a019c3c68", "parents": [ "43d4b759f5c1a3257b5413b796f58daa4578d45a", "28a0e9ec74e5192aacffb279c80619ef284062b0" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Tue Sep 13 23:13:40 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Sep 13 23:13:40 2016 +0000" }, "message": "Radio: get service by value.\nam: 28a0e9ec74\n\nChange-Id: If9c934531b2c88edccf179911d8fa2aa4c05f82e\n" }, { "commit": "bd33d5672f689b71be7d96683eb9235501ab0469", "tree": "74080a0b26a046f23bf36f624d783b351e9f118f", "parents": [ "4636e7256a887074938467c7f71e2d79a61b2d90", "3b01b3019b1c62132792a1a94e2dc1f7cfc84f2e" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Tue Sep 13 23:13:40 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Sep 13 23:13:40 2016 +0000" }, "message": "SoundTrigger: get service by value.\nam: 3b01b3019b\n\nChange-Id: Ibb98c945e51fef6d21e91b1e9f670eb4f83c5663\n" }, { "commit": "d9288b85b35e41ff330242ecb3a4e310ae14f2d3", "tree": "211802091034d6ebc5f55c44f49dbd4ed543c9c9", "parents": [ "563b1009577ba6bd69847a7ccef609014987c8a0", "3b01b3019b1c62132792a1a94e2dc1f7cfc84f2e" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Tue Sep 13 23:04:34 2016 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Sep 13 23:04:34 2016 +0000" }, "message": "Merge \"SoundTrigger: get service by value.\" into lmp-dev" }, { "commit": "28a0e9ec74e5192aacffb279c80619ef284062b0", "tree": "e3b12f02e07f09992385206578f3b9367c6141a2", "parents": [ "483c0d40535b9787160ec1fa79dbf3cbc273b93f" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Wed Sep 07 16:58:39 2016 -0700" }, "committer": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Fri Sep 09 11:46:43 2016 -0700" }, "message": "Radio: get service by value.\n\nGet strong pointer to service interface by value and not reference to\nprevent race conditions where the service pointer can be cleared\nby another thread while in use.\n\nBug: 30907212\nChange-Id: Iae838b3b672562c1d0cd63968399a6bfdda7f5ab\n" }, { "commit": "61bb7a0d99bcacac5ae4ea2171add8d4dd9ea459", "tree": "4331e45a52581bd856bea1abd2f6189a2785a5a7", "parents": [ "beb7008c2e6c8ee71b5e5aaf101990ea52a67da1", "da3cba194bff674f5a3f4b0249a651b00ab00c37" ], "author": { "name": "Lajos Molnar", "email": "lajos@google.com", "time": "Fri Sep 09 17:00:44 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Sep 09 17:00:44 2016 +0000" }, "message": "DO NOT MERGE: IOMX: work against metadata buffer spoofing am: 9a4768f7bf\nam: da3cba194b\n\nChange-Id: I018340e57d237e4d36d68e2cd118336242447b9c\n" }, { "commit": "c5251a627cd1c4c9403c80458fa10768813e7202", "tree": "fe4ae673410484aa9ddd73a94eb2fba87ce8401c", "parents": [ "0dd714e4081b874425aef6c40b152fb918ae595e", "ee9effab3decc4275f4365b78c96911018e8de8c" ], "author": { "name": "Lajos Molnar", "email": "lajos@google.com", "time": "Fri Sep 09 16:59:46 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Sep 09 16:59:46 2016 +0000" }, "message": "DO NOT MERGE: IOMX: work against metadata buffer spoofing am: 807e827d4c\nam: ee9effab3d\n\nChange-Id: I64bd10fa5e5e5a020c129c0b77d813a2772376a0\n" }, { "commit": "8751b3c3ac6a6cc606a0fce1e8ed0a01a1168c08", "tree": "1abd48dce8c96f2bb3126a41ff0c53509aa12524", "parents": [ "647f55d75de0a6b09b2171682e78de34160f09f2", "f8a4cb410115045278f534e54b41ac78d6bf6c07" ], "author": { "name": "Lajos Molnar", "email": "lajos@google.com", "time": "Fri Sep 09 16:56:46 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Sep 09 16:56:46 2016 +0000" }, "message": "IOMX: work against metadata buffer spoofing\nam: f8a4cb4101\n\nChange-Id: I3aeec794c96fe3b0000546700e010b5ddc6e4f0f\n" }, { "commit": "030fbd4835412d07edcfb80230d930c3819dd2ee", "tree": "4783d31fd627ae6625b21f92840d4cb9c6e4d30f", "parents": [ "9a6861cbd3bb0e1b8fe4c105795256ee032f9664", "f8a4cb410115045278f534e54b41ac78d6bf6c07" ], "author": { "name": "Lajos Molnar", "email": "lajos@google.com", "time": "Fri Sep 09 16:52:15 2016 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Sep 09 16:52:15 2016 +0000" }, "message": "Merge \"IOMX: work against metadata buffer spoofing\" into mnc-dev" }, { "commit": "3b01b3019b1c62132792a1a94e2dc1f7cfc84f2e", "tree": "788c73afa82ff5d0beaf8b5628870a342b28bb19", "parents": [ "de97dbd662bc959bfe4a894c8678f1383294e148" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Wed Sep 07 16:58:39 2016 -0700" }, "committer": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Fri Sep 09 09:15:30 2016 -0700" }, "message": "SoundTrigger: get service by value.\n\nGet strong pointer to service interface by value and not reference to\nprevent race conditions where the service pointer can be cleared\nby another thread while in use.\n\nBug: 30907212\nChange-Id: I6f02ec3fd1e6392b842b334e1cc4f9aa23916009\n" }, { "commit": "9a4768f7bfcd4654f93ad9b22eff87df493a9d5e", "tree": "6ce64deb9302b71b954bd076210592384598f082", "parents": [ "0e2cc67785e417da3df72b3e7d8fcb792582b076" ], "author": { "name": "Lajos Molnar", "email": "lajos@google.com", "time": "Tue Aug 02 07:07:05 2016 -0700" }, "committer": { "name": "Lajos Molnar", "email": "lajos@google.com", "time": "Thu Aug 18 14:29:49 2016 -0700" }, "message": "DO NOT MERGE: IOMX: work against metadata buffer spoofing\n\n- Prohibit direct set/getParam/Settings for extensions meant for\n OMXNodeInstance alone. This disallows enabling metadata mode\n without the knowledge of OMXNodeInstance.\n- Do not share metadata mode buffers cross process.\n- Disallow setting up metadata mode/tunneling/input surface\n after first sendCommand. (Except to Idle for OMXCodec quirk.)\n- Disallow store-meta for input cross process.\n- Disallow emptyBuffer for surface input (via IOMX).\n- Fix checking for input surface.\n\n[backported from M]\n\nBug: 29422020\nChange-Id: I801c77b80e703903f62e42d76fd2e76a34e4bc8e\n" }, { "commit": "86369364a07c85dd8f0e890b783a7bd434b8ef7c", "tree": "6a17ee31928e7fef5edee7d01467a0208f303cf3", "parents": [ "8f4b1a7de0e102b9203cfda3970edd2eedd9becf" ], "author": { "name": "Lajos Molnar", "email": "lajos@google.com", "time": "Tue Aug 02 07:07:05 2016 -0700" }, "committer": { "name": "Lajos Molnar", "email": "lajos@google.com", "time": "Thu Aug 18 14:25:51 2016 -0700" }, "message": "DO NOT MERGE: IOMX: work against metadata buffer spoofing\n\n- Prohibit direct set/getParam/Settings for extensions meant for\n OMXNodeInstance alone. This disallows enabling metadata mode\n without the knowledge of OMXNodeInstance.\n- Do not share metadata mode buffers cross process.\n- Disallow setting up metadata mode/tunneling/input surface\n after first sendCommand. (Except to Idle state for OMXCodec quirk.)\n- Disallow store-meta for input cross process.\n- Disallow emptyBuffer for surface input (via IOMX).\n- Fix checking for input surface.\n\n[backported from L-MR1]\n\nBug: 29422020\nChange-Id: I801c77b80e703903f62e42d76fd2e76a34e4bc8e\n" }, { "commit": "807e827d4c1196754faaf138cb93c57c5b137e69", "tree": "af2fecd37fa95b1dfa1aaff16d6789d7f3131e33", "parents": [ "17a10c50e20d934c1ac5956fe9019d3013e3f8b3" ], "author": { "name": "Lajos Molnar", "email": "lajos@google.com", "time": "Tue Aug 02 07:07:05 2016 -0700" }, "committer": { "name": "Lajos Molnar", "email": "lajos@google.com", "time": "Thu Aug 18 14:16:15 2016 -0700" }, "message": "DO NOT MERGE: IOMX: work against metadata buffer spoofing\n\n- Prohibit direct set/getParam/Settings for extensions meant for\n OMXNodeInstance alone. This disallows enabling metadata mode\n without the knowledge of OMXNodeInstance.\n- Do not share metadata mode buffers cross process.\n- Disallow setting up metadata mode/input surface\n after first sendCommand (except to Idle for OMXCodec quirk).\n- Disallow store-meta for input cross process.\n- Disallow emptyBuffer for surface input (via IOMX).\n- Fix checking for input surface.\n\n[backported from L]\n\nBug: 29422020\nChange-Id: I801c77b80e703903f62e42d76fd2e76a34e4bc8e\n" }, { "commit": "5e523ead5ae5bf9534174e9a423f84b152c9b576", "tree": "c9aaea36e603fd636e3e64e797654244aac24793", "parents": [ "7543b66cfd46751a33a31f1c008ede9f11c54b5c", "07d73a0a3f20bb089475fe538c9f760eea69f55f" ], "author": { "name": "Pawin Vongmasa", "email": "pawin@google.com", "time": "Fri Aug 12 21:03:53 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Aug 12 21:03:53 2016 +0000" }, "message": "DO NOT MERGE - ACodec: Save and use the previous crop rectangle.\nam: 07d73a0a3f\n\nChange-Id: I52c3cf5e2ccc0e2c84b0e634dba8e10054d4ff42\n" }, { "commit": "07d73a0a3f20bb089475fe538c9f760eea69f55f", "tree": "087ed818ab60cdce750bd94e1741be4a4f31ed3b", "parents": [ "7ab70a7ba9ff522d45763af48d15aac805738d9c" ], "author": { "name": "Pawin Vongmasa", "email": "pawin@google.com", "time": "Thu Aug 11 18:51:24 2016 -0700" }, "committer": { "name": "Pawin Vongmasa", "email": "pawin@google.com", "time": "Fri Aug 12 02:16:07 2016 +0000" }, "message": "DO NOT MERGE - ACodec: Save and use the previous crop rectangle.\n\nWhen the surface changes, set the crop rectangle for the new native\nwindow using the previous crop rectangle if available.\n\nAlso prevent null pointer dereferencing in debug mode.\n\nBug: 30690174\n\nChange-Id: I7a707d661ced5a87fcaa8568cbb903fbc26ea346\n" }, { "commit": "f8a4cb410115045278f534e54b41ac78d6bf6c07", "tree": "277909e121cf816d871fc1203b58f87413f83be0", "parents": [ "7ab70a7ba9ff522d45763af48d15aac805738d9c" ], "author": { "name": "Lajos Molnar", "email": "lajos@google.com", "time": "Tue Aug 02 07:07:05 2016 -0700" }, "committer": { "name": "Lajos Molnar", "email": "lajos@google.com", "time": "Wed Aug 03 14:39:52 2016 +0000" }, "message": "IOMX: work against metadata buffer spoofing\n\n- Prohibit direct set/getParam/Settings for extensions meant for\n OMXNodeInstance alone. This disallows enabling metadata mode\n without the knowledge of OMXNodeInstance.\n- Do not share metadata mode buffers cross process.\n- Disallow setting up metadata mode/tunneling/input surface\n after first sendCommand.\n- Disallow store-meta for input cross process.\n- Disallow emptyBuffer for surface input (via IOMX).\n- Fix checking for input surface.\n\nBug: 29422020\nChange-Id: I801c77b80e703903f62e42d76fd2e76a34e4bc8e\n" }, { "commit": "a5ad0383f56b9d4ae31875f6d10f4d9c2d97921a", "tree": "88116eeb17ed2868dc6252faab13fa0fa18c16af", "parents": [ "5fa433b8c9ff7d415f5fb1ebefe0d989a7d11432", "b53ba5e7a68deb8d71cf145639fe8a184078fff5" ], "author": { "name": "Wonsik Kim", "email": "wonsik@google.com", "time": "Wed Jun 22 18:46:49 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Jun 22 18:46:49 2016 +0000" }, "message": "Merge \\\\\\\\\\\\\"Revert \\\\\\\\\\\\\"Impose a size bound for dynamically allocated tables in stbl.\\\\\\\\\\\\\"\\\\\\\\\\\\\" into klp-dev am: 7e6bd6a911 am: 3ad7688745 am: 9d65d13cc7 am: 4ef5122525 am: 77d31bde26\nam: b53ba5e7a6\n\nChange-Id: I72a7f15894380adabfc21e017abac88b6fe26348\n" }, { "commit": "77d31bde26ba5c3c986fce1dcfa94a2727253f49", "tree": "856d7a7b625973b25453be2f1a57a62e7418a9dd", "parents": [ "fcb008b74333b63074144198e1f069473ce5fda0", "4ef5122525e0ce7a4d3e16bb07c295340a813b00" ], "author": { "name": "Wonsik Kim", "email": "wonsik@google.com", "time": "Wed Jun 22 18:39:08 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Jun 22 18:39:08 2016 +0000" }, "message": "Merge \\\\\\\\\"Revert \\\\\\\\\"Impose a size bound for dynamically allocated tables in stbl.\\\\\\\\\"\\\\\\\\\" into klp-dev am: 7e6bd6a911 am: 3ad7688745 am: 9d65d13cc7\nam: 4ef5122525\n\nChange-Id: Ib0106bbe2ffba8de744907a2714eedf207756abe\n" }, { "commit": "4ef5122525e0ce7a4d3e16bb07c295340a813b00", "tree": "681ce3d5db15f8161147c550662dd5dd03a8ff21", "parents": [ "7e06799472dd93f3c4e33807ab41256e75287291", "9d65d13cc7c207d4ef877df2834d4fbac74741ad" ], "author": { "name": "Wonsik Kim", "email": "wonsik@google.com", "time": "Wed Jun 22 18:36:14 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Jun 22 18:36:14 2016 +0000" }, "message": "Merge \\\\\\\"Revert \\\\\\\"Impose a size bound for dynamically allocated tables in stbl.\\\\\\\"\\\\\\\" into klp-dev am: 7e6bd6a911 am: 3ad7688745\nam: 9d65d13cc7\n\nChange-Id: Ib8d8f9c58c1ffb169cf488d57fb841f80a664e97\n" }, { "commit": "9d65d13cc7c207d4ef877df2834d4fbac74741ad", "tree": "0d22666b8004a8e4ae781514d99b9a00e0059d16", "parents": [ "4c969bf93f71e394de3aa8b08f0ed0f96c48379d", "3ad7688745fc44d01707157ba4edcbad8d41fc3e" ], "author": { "name": "Wonsik Kim", "email": "wonsik@google.com", "time": "Wed Jun 22 18:33:49 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Jun 22 18:33:49 2016 +0000" }, "message": "Merge \\\\\"Revert \\\\\"Impose a size bound for dynamically allocated tables in stbl.\\\\\"\\\\\" into klp-dev am: 7e6bd6a911\nam: 3ad7688745\n\nChange-Id: I02de46ed2ce14428a45826270b557426ee2aaf47\n" }, { "commit": "7e6bd6a911c5eba7b36b9b01804dd4d00132a175", "tree": "57ee9ab2cc93c2fbaaaaf8e77999dac195fc770e", "parents": [ "8f73edb22a30260a2f4f7946fbedd3fd3005c5b6", "66c4dbb96c38630d0cd6551fc8c9bf8fa3318903" ], "author": { "name": "Wonsik Kim", "email": "wonsik@google.com", "time": "Wed Jun 22 18:27:32 2016 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Jun 22 18:27:32 2016 +0000" }, "message": "Merge \"Revert \"Impose a size bound for dynamically allocated tables in stbl.\"\" into klp-dev" }, { "commit": "66c4dbb96c38630d0cd6551fc8c9bf8fa3318903", "tree": "ec4f2f5e250208980491f0b0fbc0ee250d3bc15c", "parents": [ "25e029746796fe88e82417fb01af2e27b8bbadb2" ], "author": { "name": "Wonsik Kim", "email": "wonsik@google.com", "time": "Wed Jun 22 18:19:15 2016 +0000" }, "committer": { "name": "Wonsik Kim", "email": "wonsik@google.com", "time": "Wed Jun 22 18:19:15 2016 +0000" }, "message": "Revert \"Impose a size bound for dynamically allocated tables in stbl.\"\n\nThis reverts commit 25e029746796fe88e82417fb01af2e27b8bbadb2.\n\nChange-Id: I91225838a8be72a3cd413f2bcb99e7dca7e62929\n" }, { "commit": "5fa433b8c9ff7d415f5fb1ebefe0d989a7d11432", "tree": "b4faed4e03cd239a9daa691253deceea3a917588", "parents": [ "24bf4834182bf8e96af8e16f1f50617f8bfae9ac", "26dc0a2a9130c406541aa76285fa0e64112fb1e8" ], "author": { "name": "Wonsik Kim", "email": "wonsik@google.com", "time": "Wed Jun 22 18:11:22 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Jun 22 18:11:22 2016 +0000" }, "message": "Merge \\\\\\\\\\\\\"Impose a size bound for dynamically allocated tables in stbl.\\\\\\\\\\\\\" into klp-dev am: 8f73edb22a am: a263248bf0 am: 4c969bf93f am: 7e06799472 am: fcb008b743\nam: 26dc0a2a91\n\nChange-Id: Ic91093f89dad5ada3f6997b7dff1557e726099c4\n" }, { "commit": "fcb008b74333b63074144198e1f069473ce5fda0", "tree": "1f407c84e31c79adc83e545b59d001cf4c91cf67", "parents": [ "f45a909f14380be824e28e8c29774f404aeb40b0", "7e06799472dd93f3c4e33807ab41256e75287291" ], "author": { "name": "Wonsik Kim", "email": "wonsik@google.com", "time": "Wed Jun 22 18:01:43 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Jun 22 18:01:43 2016 +0000" }, "message": "Merge \\\\\\\\\"Impose a size bound for dynamically allocated tables in stbl.\\\\\\\\\" into klp-dev am: 8f73edb22a am: a263248bf0 am: 4c969bf93f\nam: 7e06799472\n\nChange-Id: I4c877fcf9839e44ca849d25f46ba55f74cd0064e\n" }, { "commit": "7e06799472dd93f3c4e33807ab41256e75287291", "tree": "843c2e0db67fc2232d609ae6f80566b72722a682", "parents": [ "495ba35a1706cbf6fa95616e23c6b656f3b1048b", "4c969bf93f71e394de3aa8b08f0ed0f96c48379d" ], "author": { "name": "Pawin Vongmasa", "email": "pawin@google.com", "time": "Wed Jun 22 17:58:26 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Jun 22 17:58:26 2016 +0000" }, "message": "Merge \\\\\\\"Impose a size bound for dynamically allocated tables in stbl.\\\\\\\" into klp-dev am: 8f73edb22a am: a263248bf0\nam: 4c969bf93f\n\nChange-Id: I6258bac89bbe02e47b3c912df26f26033d7b76b4\n" }, { "commit": "4c969bf93f71e394de3aa8b08f0ed0f96c48379d", "tree": "637b8ec7d12c6d0fa0341098f22267172baf93d9", "parents": [ "5c1f01675ca0f4f231f206fc7fe64d353592f726", "a263248bf02014dfb5d76ac4c07e7dfcdd6518c1" ], "author": { "name": "Wonsik Kim", "email": "wonsik@google.com", "time": "Wed Jun 22 17:55:12 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Jun 22 17:55:12 2016 +0000" }, "message": "Merge \\\\\"Impose a size bound for dynamically allocated tables in stbl.\\\\\" into klp-dev am: 8f73edb22a\nam: a263248bf0\n\nChange-Id: I0389073f6b18450edc8fa70ed3ec72683a166915\n" }, { "commit": "8f73edb22a30260a2f4f7946fbedd3fd3005c5b6", "tree": "64727d7547fdef61a404952709b3867f48f681d8", "parents": [ "22d65757103e46bef8c6902ea08c84a775b62a0b", "25e029746796fe88e82417fb01af2e27b8bbadb2" ], "author": { "name": "Wonsik Kim", "email": "wonsik@google.com", "time": "Wed Jun 22 17:38:54 2016 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Jun 22 17:38:54 2016 +0000" }, "message": "Merge \"Impose a size bound for dynamically allocated tables in stbl.\" into klp-dev" }, { "commit": "25e029746796fe88e82417fb01af2e27b8bbadb2", "tree": "b09f9538145fdae6557e38aae36433a8faad7603", "parents": [ "dc7357d20175fadfabd903370094917408bf6e3e" ], "author": { "name": "Pawin Vongmasa", "email": "pawin@google.com", "time": "Tue Jun 21 19:10:21 2016 -0700" }, "committer": { "name": "Pawin Vongmasa", "email": "pawin@google.com", "time": "Wed Jun 22 01:00:26 2016 -0700" }, "message": "Impose a size bound for dynamically allocated tables in stbl.\n\nImpose a restriction of 200MiB for tables in stsc, stts, ctts and stss\nboxes. Also change Vector to std::vector for efficiency and consistency.\n\nBug: 29367429\nChange-Id: I175da524612b9fe68496c612966af51f01a5cd5e\n" }, { "commit": "5c1f01675ca0f4f231f206fc7fe64d353592f726", "tree": "0d22666b8004a8e4ae781514d99b9a00e0059d16", "parents": [ "8b35cb563de25a0b5f743de2eeb385a87e95ca6c", "4bec033dedcb2e9297001878c7837a3d46d205a3" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Tue Jun 21 22:03:33 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Jun 21 22:03:33 2016 +0000" }, "message": "Merge \\\\\"DO NOT MERGE: Camera: Adjust pointers to ANW buffers to avoid infoleak\\\\\" into klp-dev am: 22d6575710\nam: 4bec033ded\n\nChange-Id: I68dd7d3ea94b10104c235007fd03230ef5ae0146\n" }, { "commit": "6a2589182db02a101a43c0ebcab5b5b9d7d5e082", "tree": "ae289212613d613ce0d6b250d453348def6dde15", "parents": [ "7ff681b4d1d55f26bcd74ef430e9e2605e7b3d59", "f0dc08a910e4e50d1b3b98d1195509a05798dcaf" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Tue Jun 21 22:00:25 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Jun 21 22:00:25 2016 +0000" }, "message": "Merge \\\"DO NOT MERGE: Camera: Adjust pointers to ANW buffers to avoid infoleak\\\" into mnc-dev\nam: f0dc08a910\n\nChange-Id: I1ce29159fdfc1fe343e91df11d804902720bdcbf\n" }, { "commit": "79c139a492bdf2977cf07d6faaf1b0268c1026da", "tree": "d0f27a75a51cfc303b450a8062e64244e87bd42a", "parents": [ "b6ba5f90166a1121047838d72fd4adb4ad4b74d4" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Mon Jun 20 17:00:14 2016 -0700" }, "committer": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Mon Jun 20 21:32:49 2016 -0700" }, "message": "DO NOT MERGE: Camera: Adjust pointers to ANW buffers to avoid infoleak\n\nSubtract address of a random static object from pointers being routed\nthrough app process.\n\nBug: 28466701\nChange-Id: Idcbfe81e9507433769672f3dc6d67db5eeed4e04\n" }, { "commit": "54fc49c9f5ac06ea3c21cfe05a00f36c7df91b3f", "tree": "1ac44e86f7e902ab31974e23e456260033c87a05", "parents": [ "cf1aed625841c82c050fc6d460f561038f772a9c" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Mon Jun 20 17:00:14 2016 -0700" }, "committer": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Mon Jun 20 21:32:22 2016 -0700" }, "message": "DO NOT MERGE: Camera: Adjust pointers to ANW buffers to avoid infoleak\n\nSubtract address of a random static object from pointers being routed\nthrough app process.\n\nBug: 28466701\nChange-Id: Idcbfe81e9507433769672f3dc6d67db5eeed4e04\n" }, { "commit": "7a3de84808f700615816397acc7c7927987bab6e", "tree": "926c2963967ecb1fb82d5b4584433b30dd3e531d", "parents": [ "dc7357d20175fadfabd903370094917408bf6e3e" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Mon Jun 20 17:00:14 2016 -0700" }, "committer": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Mon Jun 20 21:32:08 2016 -0700" }, "message": "DO NOT MERGE: Camera: Adjust pointers to ANW buffers to avoid infoleak\n\nSubtract address of a random static object from pointers being routed\nthrough app process.\n\nBug: 28466701\nChange-Id: Idcbfe81e9507433769672f3dc6d67db5eeed4e04\n" }, { "commit": "1f56e8a581b26bad357865aee53063e246dbdc55", "tree": "4a2afd032390c1a4a94718e3540ce7cb03cdb262", "parents": [ "8c88ef273f6f2077c45c920dfb36e26fc930303b", "4905ff3baf0527641b93892357e93075583e61dc" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Thu Jun 09 18:37:08 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Jun 09 18:37:08 2016 +0000" }, "message": "Merge \\\\\"Don\\\\\u0027t use sp\u003c\u003e\u0026\\\\\" into lmp-mr1-ub-dev am: 277a8ab9ab\nam: 4905ff3baf\n\nChange-Id: Ia8ba85cf0bde2f32afb7f6704e4653c6c0e907ed\n" }, { "commit": "4905ff3baf0527641b93892357e93075583e61dc", "tree": "c18fe56029e156a76bf42732a9a54040fe485bc1", "parents": [ "69ee337c842f29ba2ddd6c54509925fcb303f855", "277a8ab9ab965c1731c24dc05f24c23090b5dd25" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Thu Jun 09 18:31:10 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Jun 09 18:31:10 2016 +0000" }, "message": "Merge \\\"Don\\\u0027t use sp\u003c\u003e\u0026\\\" into lmp-mr1-ub-dev\nam: 277a8ab9ab\n\nChange-Id: I67bac3501905ca69180bf187bf53a4a0e7581ee8\n" }, { "commit": "d01cc80eaf2c5e1a1681d1410626c0ea7ba1dca8", "tree": "8a1c35093cbc3047302712b71b494cf6de353750", "parents": [ "edf89fa6b7722c8a02ea54f5959e73c309e4b5af" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Tue Jun 07 12:26:43 2016 -0700" }, "committer": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Thu Jun 09 10:51:07 2016 -0700" }, "message": "Don\u0027t use sp\u003c\u003e\u0026\n\nbecause they may end up pointing to NULL after a NULL check was performed.\n\nBug: 28166152\nChange-Id: Iab2ea30395b620628cc6f3d067dd4f6fcda824fe\n" }, { "commit": "949333a3ab4868c1cc7b2e0ed26d045fd99d8a88", "tree": "fcb2eb5c39ff0f580a509faabaf585feef73c57a", "parents": [ "803ae13af2bef90c651cbcccb76bbd75403ff1ab", "d0f4bfb5527e88e868c4263cb6c9d219367b9fc9" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Thu Jun 09 17:18:06 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Jun 09 17:18:06 2016 +0000" }, "message": "Don\\\u0027t use sp\u003c\u003e\u0026\nam: d0f4bfb552\n\nChange-Id: I0490c443ad93133a8023134789dcecbcfc159cf3\n" }, { "commit": "d0f4bfb5527e88e868c4263cb6c9d219367b9fc9", "tree": "69301a8556126d12747adc0544dc57a8c389d97a", "parents": [ "33e914c861732cbcca923d34d368e1635b68434f" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Tue Jun 07 12:26:43 2016 -0700" }, "committer": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Wed Jun 08 17:10:39 2016 -0700" }, "message": "Don\u0027t use sp\u003c\u003e\u0026\n\nbecause they may end up pointing to NULL after a NULL check was performed.\n\nBug: 28166152\nChange-Id: Iab2ea30395b620628cc6f3d067dd4f6fcda824fe\n" }, { "commit": "e66381758d6ba02494251e6097e0774a56524be5", "tree": "df4f40e2ccb8ca187d1b6a65a597e01ea5615605", "parents": [ "08cb85206ab65cc2b9df372e4ae5f75c331ae7a1", "0ee3710873997f09b9a0a645e8b2de9923894f17" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Wed Jun 08 23:14:09 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Jun 08 23:14:09 2016 +0000" }, "message": "Merge \\\\\"Don\\\\\u0027t use sp\u003c\u003e\u0026\\\\\" into klp-dev am: 598f8d3218\nam: 0ee3710873\n\nChange-Id: I95ce93c3c1975b444bd6cd2c49a3b215395d2754\n" }, { "commit": "fc47a301b7b2b044eddaedc98861d55193ec7dc0", "tree": "8f64350afe90fc797bba02c7a24720a9c80c31f5", "parents": [ "b016207fc2442420e8d3a8633575ffe4fc29fef3" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Tue Jun 07 12:26:43 2016 -0700" }, "committer": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Tue Jun 07 12:31:11 2016 -0700" }, "message": "Don\u0027t use sp\u003c\u003e\u0026\n\nbecause they may end up pointing to NULL after a NULL check was performed.\n\nBug: 28166152\nChange-Id: Iab2ea30395b620628cc6f3d067dd4f6fcda824fe\n" }, { "commit": "93cfc25deb117d6724aaf01be92054884178b7f2", "tree": "e18755c22be8bba808b3f46338583c9178eac9dd", "parents": [ "20f9cec4ba05217873a3e748da810da3642a83eb", "a265388ac9c5c6c64272fd0d143f8ed79f4edd3e" ], "author": { "name": "Pawin Vongmasa", "email": "pawin@google.com", "time": "Mon Apr 18 20:20:19 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Mon Apr 18 20:20:19 2016 +0000" }, "message": "Merge \"resolve merge conflicts of 87695f6 to mnc-dev\" into mnc-dev\nam: a265388\n\n* commit \u0027a265388ac9c5c6c64272fd0d143f8ed79f4edd3e\u0027:\n SampleTable.cpp: Prevent corrupted stts block from causing excessive memory allocation.\n\nChange-Id: Ib9f67677abf99a315669975a386d615fe682a954\n" }, { "commit": "44a1dc40b0c66ca2f66c4be4debdcc908a3c5f8b", "tree": "3f75e7fb8f608fe2f96e7d529b31151f097353eb", "parents": [ "13d35885fed6e00ec7ac3493dd3fb7bdb98a8cf8", "87695f6695d184a1b7c47b6957ae106049494901" ], "author": { "name": "Pawin Vongmasa", "email": "pawin@google.com", "time": "Fri Apr 15 18:32:11 2016 -0700" }, "committer": { "name": "Pawin Vongmasa", "email": "pawin@google.com", "time": "Fri Apr 15 18:32:11 2016 -0700" }, "message": "resolve merge conflicts of 87695f6 to mnc-dev\n\nChange-Id: I14bcb8f00724f9dc09ae8ec85d403f06f354db47\n" }, { "commit": "87695f6695d184a1b7c47b6957ae106049494901", "tree": "0e26399ba2dd1da416a61724eb1bee2b0914e470", "parents": [ "3e1803fc40052b5cf6f3f7a63aa82bf446749724", "f7201862c852cbf780e546c0e23e23cd7dcab4a1" ], "author": { "name": "Pawin Vongmasa", "email": "pawin@google.com", "time": "Sat Apr 16 00:19:22 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Sat Apr 16 00:19:22 2016 +0000" }, "message": "Merge \"SampleTable.cpp: Prevent corrupted stts block from causing excessive memory allocation.\" into klp-dev am: 5964527 am: e896c41 am: a0970c9 am: ab72763 am: 8cf4bf3\nam: f720186\n\n* commit \u0027f7201862c852cbf780e546c0e23e23cd7dcab4a1\u0027:\n SampleTable.cpp: Prevent corrupted stts block from causing excessive memory allocation.\n\nChange-Id: I3b26c1a4781e38d2b327b09972091d169bba1338\n" }, { "commit": "8cf4bf38b13adb805746a3f3e172670b1af7c9fd", "tree": "9012536dcc279186bb0014559404e3e785a6cc9c", "parents": [ "9d9ebc990f4b4b18f48d09232b053b3cb69dbb6b", "ab7276351e41bc0d40d28c231993ba240b5f21a0" ], "author": { "name": "Pawin Vongmasa", "email": "pawin@google.com", "time": "Sat Apr 16 00:13:47 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Sat Apr 16 00:13:47 2016 +0000" }, "message": "Merge \"SampleTable.cpp: Prevent corrupted stts block from causing excessive memory allocation.\" into klp-dev am: 5964527 am: e896c41 am: a0970c9\nam: ab72763\n\n* commit \u0027ab7276351e41bc0d40d28c231993ba240b5f21a0\u0027:\n SampleTable.cpp: Prevent corrupted stts block from causing excessive memory allocation.\n\nChange-Id: I3dc4066c53dfeb3fc07ee31431ee5a5571c89528\n" }, { "commit": "ab7276351e41bc0d40d28c231993ba240b5f21a0", "tree": "ee86ba8839dec7ccb3906ab7db5169a617b1bfa8", "parents": [ "76f606bdf9d52a4406dc285e06a0f15b13903bac", "a0970c9faabdaca647cb22b78432511de3220399" ], "author": { "name": "Pawin Vongmasa", "email": "pawin@google.com", "time": "Sat Apr 16 00:11:25 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Sat Apr 16 00:11:25 2016 +0000" }, "message": "Merge \"SampleTable.cpp: Prevent corrupted stts block from causing excessive memory allocation.\" into klp-dev am: 5964527 am: e896c41\nam: a0970c9\n\n* commit \u0027a0970c9faabdaca647cb22b78432511de3220399\u0027:\n SampleTable.cpp: Prevent corrupted stts block from causing excessive memory allocation.\n\nChange-Id: I7d7e410e25d8a5b1066251cae8cddfa050b07f71\n" }, { "commit": "a0970c9faabdaca647cb22b78432511de3220399", "tree": "f1f32337b6812a38e1fda5417b3489e9b84de193", "parents": [ "9f3762d8c76b778c8f600486a464838731105b09", "e896c41d85a15de06c74885fe040f3f57b63cd5d" ], "author": { "name": "Pawin Vongmasa", "email": "pawin@google.com", "time": "Sat Apr 16 00:09:00 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Sat Apr 16 00:09:00 2016 +0000" }, "message": "Merge \"SampleTable.cpp: Prevent corrupted stts block from causing excessive memory allocation.\" into klp-dev am: 5964527\nam: e896c41\n\n* commit \u0027e896c41d85a15de06c74885fe040f3f57b63cd5d\u0027:\n SampleTable.cpp: Prevent corrupted stts block from causing excessive memory allocation.\n\nChange-Id: I5f23c14d155ea5a64b00d877a329c77cfc5b55f7\n" }, { "commit": "a3630a418b4f65277a42cd4018cd3b0b7e134d0c", "tree": "faeb669973973cbe4c538f4eec492a1bb9575997", "parents": [ "52636f8462b2a24f77524ca912e3579c33ac113e" ], "author": { "name": "Pawin Vongmasa", "email": "pawin@google.com", "time": "Wed Apr 13 16:25:12 2016 -0700" }, "committer": { "name": "Pawin Vongmasa", "email": "pawin@google.com", "time": "Thu Apr 14 23:25:16 2016 +0000" }, "message": "SampleTable.cpp: Prevent corrupted stts block from causing\nexcessive memory allocation.\n\nDetails:\n\nDataSource.h\n- Added function getVector() for reading from a data source into\n a Vector object, whose capacity grows only as much as needed\n (in case of EOS or reading error).\nSampleTable.h\n- Changed the type of mTimeToSample from uint32_t* to\n Vector\u003cuint32_t\u003e.\nSampleTable.cpp\n- In setTimeToSample, modified the code to use getVector()\n instead of readAt(). If the input source has a corrupt\n time-to-sample table size that is too big, EOS will be reached\n before the whole table is read, and the return value from\n getVector() will be false.\n- Also, tightened the bound for the provided time-to-sample table\n size to guarantee that the table does not take more than\n UINT_MAX32 bytes in memory.\n\nBug: 28076789\nChange-Id: Id207f369ab7b27787d83f5d8fc48dc53ed9fcdc9\n" }, { "commit": "31e2a27f876edbe49988bd4307365d481c1de7e8", "tree": "b655644388cf5c474bcf08779a656e11a032400b", "parents": [ "9222aaf44d79e501c513887f74979f16226b2fc7", "c1c50e7b47784c5e6978eda67db68ef4951144c6" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Tue Mar 15 20:25:20 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Mar 15 20:25:20 2016 +0000" }, "message": "Fix size check for OMX_IndexParamConsumerUsageBits\nam: c1c50e7b47\n\n* commit \u0027c1c50e7b47784c5e6978eda67db68ef4951144c6\u0027:\n Fix size check for OMX_IndexParamConsumerUsageBits\n" }, { "commit": "c1c50e7b47784c5e6978eda67db68ef4951144c6", "tree": "f53286f0d92416525fee698ce7983f609759da19", "parents": [ "f1a2668f4f09e38722424a6a74f0ea26f49e4110" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Thu Mar 10 15:02:13 2016 -0800" }, "committer": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Fri Mar 11 14:47:45 2016 -0800" }, "message": "Fix size check for OMX_IndexParamConsumerUsageBits\n\nsince it doesn\u0027t follow the OMX convention. And remove support\nfor the kClientNeedsFrameBuffer flag.\n\nBug: 27207275\nChange-Id: Ia2c119e2456ebf9e2f4e1de5104ef9032a212255\n" }, { "commit": "6d65ec1f7256a3de55ed79e97f6c21726ac2bd00", "tree": "3cfe29c9294e77e1affb686183d620f3f7720185", "parents": [ "00ff259b1ac53d39cd46846b06532781b1ed95bd", "52598348340ba20048a1d6304b39b548a95be18f" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Wed Feb 24 22:20:57 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Feb 24 22:20:57 2016 +0000" }, "message": "Get service by value instead of reference am: 61a6d26aab am: 93f5bcab20 am: d11972f8d4 am: c0cefa9f37 am: 73079eec40 am: 5984d6cbf9 am: 6bac803b15\nam: 5259834834\n\n* commit \u002752598348340ba20048a1d6304b39b548a95be18f\u0027:\n Get service by value instead of reference\n" }, { "commit": "52598348340ba20048a1d6304b39b548a95be18f", "tree": "8f0dd3347c4514f90c1ef120d929d3b1c55d7898", "parents": [ "957c386860aa8af0505c67b2dcbd3fe371abb7eb", "6bac803b1595a653180da15d409fe6167534334c" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Wed Feb 24 22:13:59 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Feb 24 22:13:59 2016 +0000" }, "message": "Get service by value instead of reference am: 61a6d26aab am: 93f5bcab20 am: d11972f8d4 am: c0cefa9f37 am: 73079eec40 am: 5984d6cbf9\nam: 6bac803b15\n\n* commit \u00276bac803b1595a653180da15d409fe6167534334c\u0027:\n Get service by value instead of reference\n" }, { "commit": "6bac803b1595a653180da15d409fe6167534334c", "tree": "1a292c76bf8582802ec03f02b96680559e273cad", "parents": [ "7786bd9376f34b23db9a67aae16368fb1851fe34", "5984d6cbf9c7eae7a0f46c948a9b35b56f0268a5" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Wed Feb 24 22:06:16 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Feb 24 22:06:16 2016 +0000" }, "message": "Get service by value instead of reference am: 61a6d26aab am: 93f5bcab20 am: d11972f8d4 am: c0cefa9f37 am: 73079eec40\nam: 5984d6cbf9\n\n* commit \u00275984d6cbf9c7eae7a0f46c948a9b35b56f0268a5\u0027:\n Get service by value instead of reference\n" }, { "commit": "73079eec4013621ac516f22b0ec6d55203d1e245", "tree": "e2a6bb52738c5f61bd14ff3be21a7bf4524c35b9", "parents": [ "d132bc5b0bc15152f7acf769408c55da7a5b31f7", "c0cefa9f37e296a7a60978e442b374b5c7f24d65" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Wed Feb 24 21:53:01 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Feb 24 21:53:01 2016 +0000" }, "message": "Get service by value instead of reference am: 61a6d26aab am: 93f5bcab20 am: d11972f8d4\nam: c0cefa9f37\n\n* commit \u0027c0cefa9f37e296a7a60978e442b374b5c7f24d65\u0027:\n Get service by value instead of reference\n" }, { "commit": "d11972f8d48d14a1a52e98e64b8216abfc7f00e0", "tree": "513d2cd1a96344f2f505defaeeffbe0188088e48", "parents": [ "776aacce9e5e2dfbc4e7a955916ea0d397af74bf", "93f5bcab205f8d7cd4557eacda513867e8b8ea65" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Wed Feb 24 21:37:05 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Feb 24 21:37:05 2016 +0000" }, "message": "Get service by value instead of reference am: 61a6d26aab\nam: 93f5bcab20\n\n* commit \u002793f5bcab205f8d7cd4557eacda513867e8b8ea65\u0027:\n Get service by value instead of reference\n" }, { "commit": "93f5bcab205f8d7cd4557eacda513867e8b8ea65", "tree": "8b1ad39e3a33cbe4b76e36e17a37cb705f8948d6", "parents": [ "33514675f6588d70a203b2c9200792bca18d425c", "61a6d26aab95870279b274e565c1495748befde0" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Wed Feb 24 21:24:09 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Feb 24 21:24:09 2016 +0000" }, "message": "Get service by value instead of reference\nam: 61a6d26aab\n\n* commit \u002761a6d26aab95870279b274e565c1495748befde0\u0027:\n Get service by value instead of reference\n" }, { "commit": "61a6d26aab95870279b274e565c1495748befde0", "tree": "d58c9beb9e499e5983db76a52f02f2456c35ff92", "parents": [ "f7a388203a1632084dbe3307d7e3265f689bc11e" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Thu Feb 18 08:25:47 2016 -0800" }, "committer": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Tue Feb 23 19:28:09 2016 -0800" }, "message": "Get service by value instead of reference\n\nto prevent a cleared service binder from being used.\n\nBug: 26040840\nChange-Id: Ifb5483c55b172d3553deb80dbe27f2204b86ecdb\n" }, { "commit": "208bc477d92dbd2e5b4d1c0b2d000fa4c231e9d3", "tree": "f24b4d3f782bf473dbeb70c5e4b579bc135eaa15", "parents": [ "9e1d7751b12ea976323abc1fe7760323ab142d39", "3d6a7149802928ecf3f58b7218b0e82699b492df" ], "author": { "name": "Andy Hung", "email": "hunga@google.com", "time": "Thu Dec 03 22:55:36 2015 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Dec 03 22:55:36 2015 +0000" }, "message": "DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread\nam: 3d6a714980\n\n* commit \u00273d6a7149802928ecf3f58b7218b0e82699b492df\u0027:\n DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread\n" }, { "commit": "3d6a7149802928ecf3f58b7218b0e82699b492df", "tree": "d1733d4792e95ae68ed843927cf38291863e4c42", "parents": [ "6afc659b00c3f4a83b9f5f3c744b7119b33340b4" ], "author": { "name": "Andy Hung", "email": "hunga@google.com", "time": "Wed Dec 02 15:55:23 2015 -0800" }, "committer": { "name": "Andy Hung", "email": "hunga@google.com", "time": "Thu Dec 03 18:54:00 2015 +0000" }, "message": "DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread\n\nSample decoding still occurs in SoundPoolThread\nwithout holding the SoundPool lock.\n\nBug: 25781119\nChange-Id: I11fde005aa9cf5438e0390a0d2dfe0ec1dd282e8\n" }, { "commit": "19c47afbc402542720ddd280e1bbde3b2277b586", "tree": "d2c3657298566f4466ea0f6ee51217ffe1a9b7a1", "parents": [ "09c291c838bc74bb7c10c22f7232abb946cad8ff" ], "author": { "name": "Andy Hung", "email": "hunga@google.com", "time": "Wed Dec 02 15:55:23 2015 -0800" }, "committer": { "name": "Andy Hung", "email": "hunga@google.com", "time": "Wed Dec 02 18:05:32 2015 -0800" }, "message": "DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread\n\nSample decoding still occurs in SoundPoolThread\nwithout holding the SoundPool lock.\n\nBug: 25781119\nChange-Id: I11fde005aa9cf5438e0390a0d2dfe0ec1dd282e8\n" }, { "commit": "00a1dcafd944ff93eb4848f044adcbfb0784a0dd", "tree": "1af7590015198858d5a2ba0e30477307e7f9713b", "parents": [ "32ab9fdab562127ccd37a8cdb15421ebdf82a458", "32ba6ec761fc62f7da217281ac5bb598ffed2db8" ], "author": { "name": "Lajos Molnar", "email": "lajos@google.com", "time": "Mon Oct 19 19:44:59 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Oct 19 19:44:59 2015 +0000" }, "message": "am 32ba6ec7: am 0378676b: am 92990810: am b1231923: am e550d213: am f70b69a8: Merge \"stagefright: check bounds for MediaCodecList.getCodecInfo\" into lmp-dev\n\n* commit \u002732ba6ec761fc62f7da217281ac5bb598ffed2db8\u0027:\n stagefright: check bounds for MediaCodecList.getCodecInfo\n" }, { "commit": "32ba6ec761fc62f7da217281ac5bb598ffed2db8", "tree": "812714a5fe147dddbb87abca1db78c8824a7a3d8", "parents": [ "7b80648180feaad1e7edaecd078246f5002a8fb6", "0378676b3f12158537a01916e69f6ab51817605f" ], "author": { "name": "Lajos Molnar", "email": "lajos@google.com", "time": "Mon Oct 19 19:41:27 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Oct 19 19:41:27 2015 +0000" }, "message": "am 0378676b: am 92990810: am b1231923: am e550d213: am f70b69a8: Merge \"stagefright: check bounds for MediaCodecList.getCodecInfo\" into lmp-dev\n\n* commit \u00270378676b3f12158537a01916e69f6ab51817605f\u0027:\n stagefright: check bounds for MediaCodecList.getCodecInfo\n" }, { "commit": "0378676b3f12158537a01916e69f6ab51817605f", "tree": "50acfa79aca6076b56c66e1f6d0d26b530038242", "parents": [ "f30d7e0acc573b58333c3c704c2a46eda1dbfcff", "92990810407a2e1101f5db156c1e264887886c82" ], "author": { "name": "Lajos Molnar", "email": "lajos@google.com", "time": "Mon Oct 19 19:37:04 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Oct 19 19:37:04 2015 +0000" }, "message": "am 92990810: am b1231923: am e550d213: am f70b69a8: Merge \"stagefright: check bounds for MediaCodecList.getCodecInfo\" into lmp-dev\n\n* commit \u002792990810407a2e1101f5db156c1e264887886c82\u0027:\n stagefright: check bounds for MediaCodecList.getCodecInfo\n" }, { "commit": "b1231923f134a167a0351091d8944b7583928a4f", "tree": "2565d910572223b4ee0b900f7545580a9d77ca63", "parents": [ "f5bff8c9df4444ca91a14ba26cfe005f9f100250", "e550d21360287c752fd79a67f1962244ee272be1" ], "author": { "name": "Lajos Molnar", "email": "lajos@google.com", "time": "Mon Oct 19 12:26:55 2015 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Oct 19 12:26:55 2015 -0700" }, "message": "am e550d213: am f70b69a8: Merge \"stagefright: check bounds for MediaCodecList.getCodecInfo\" into lmp-dev\n\n* commit \u0027e550d21360287c752fd79a67f1962244ee272be1\u0027:\n stagefright: check bounds for MediaCodecList.getCodecInfo\n" }, { "commit": "e5200ea76c5d180b53087ae7825326ec61cc4687", "tree": "d18a0e7d46858f79d0009f2ae29faa14be40c65c", "parents": [ "c4c68f63192ae7af09a6158b2e72ca7a1a7f4364", "4b710f086070fabe022b3a1f474bfcbec842b8fc" ], "author": { "name": "Ronghua Wu", "email": "ronghuawu@google.com", "time": "Tue Oct 13 21:20:27 2015 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Oct 13 21:20:27 2015 +0000" }, "message": "Merge \"libstagefright: don\u0027t reclaim codec when there\u0027s buffer owned by client. Notify the client and try to reclaim again in 0.5s.\" into mnc-dr-dev" }, { "commit": "77c185d5499d6174e7a97b3e1512994d3a803151", "tree": "f5ad0fe15b5eac1f8eb5ca52384c022ac2e60b57", "parents": [ "0b1936bee532545381db6adf22f31ac437673f30" ], "author": { "name": "Lajos Molnar", "email": "lajos@google.com", "time": "Mon Oct 12 17:10:31 2015 -0700" }, "committer": { "name": "Lajos Molnar", "email": "lajos@google.com", "time": "Mon Oct 12 17:27:17 2015 -0700" }, "message": "stagefright: check bounds for MediaCodecList.getCodecInfo\n\nBug: 24445127\nChange-Id: I1c6cb9e2518b852d48d5d0d625b54409bd4e13ec\n" }, { "commit": "91aa4a0aefa43ad53a20b3d4538a6a986c902818", "tree": "26f92a59a28b761d463006f652634d583058dbfc", "parents": [ "a6b9d752e7e266b63a2d9a694b3422198cb512a1", "f106f9e4eacc1cb10ccc851a37619ed4b37bbb1b" ], "author": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Thu Oct 08 20:10:39 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Oct 08 20:10:39 2015 +0000" }, "message": "am f106f9e4: am 15e991bd: resolved conflicts for 0b09da7a to lmp-mr1-dev\n\n* commit \u0027f106f9e4eacc1cb10ccc851a37619ed4b37bbb1b\u0027:\n DO NOT MERGE - OMX: allow only secure codec to remotely call allocateBuffer.\n" }, { "commit": "15e991bdf8870c2c9820c2d98e0d30dae2e05a25", "tree": "ad4f68934ac1f3dc1f20f9dedbccf89d1f6b75d7", "parents": [ "39f64a1e4903624bd6395aa2a1c6875a10ed489d", "0b09da7a98d5f55674dba7b380e1b8d262f709b0" ], "author": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Thu Oct 08 10:02:30 2015 -0700" }, "committer": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Thu Oct 08 10:02:30 2015 -0700" }, "message": "resolved conflicts for 0b09da7a to lmp-mr1-dev\n\nChange-Id: Ib6a1aa4cee00e0449da30ae158d71403d6236487\n" }, { "commit": "dd184a4824acc31160895e2c6f8d93a7facfc2c8", "tree": "b59541270989719862e923d24637064ef10aa810", "parents": [ "fc0e2a87c17b1f326b5e3302e8f534c143fd5784", "3b4a72acf039c58c33807b6d6fcdd5e09eafb1df" ], "author": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Thu Oct 08 16:48:33 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Oct 08 16:48:33 2015 +0000" }, "message": "am 3b4a72ac: Merge \"DO NOT MERGE - OMX: allow only secure codec to remotely call allocateBuffer.\" into klp-dev\n\n* commit \u00273b4a72acf039c58c33807b6d6fcdd5e09eafb1df\u0027:\n DO NOT MERGE - OMX: allow only secure codec to remotely call allocateBuffer.\n" }, { "commit": "2482595baadd16f20d3992c8c9d6a14061836872", "tree": "1b2d060855dc645f847ff2143e359166005f829a", "parents": [ "07395f4cd72cf29d1de2864cde42876db4e54411" ], "author": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Mon Sep 28 11:32:23 2015 -0700" }, "committer": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Wed Oct 07 13:53:25 2015 -0700" }, "message": "DO NOT MERGE - OMX: allow only secure codec to remotely call allocateBuffer.\n\nBug: 24310423\nChange-Id: Iebcfc58b447f925ec2134898060af2ef227266a3\n(cherry picked from commit 8dde7269a5356503d2b283234b6cb46d0c3f214e)\n" }, { "commit": "4a03d784f7c0e3a9685d182eee92ba6580eaf5a1", "tree": "a7356ea6c85c6d1b4b45e0288f43b4f9fe9edae4", "parents": [ "74d1927e4122a1748f89ca2ef79406fc06ee94b2" ], "author": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Mon Sep 28 11:32:23 2015 -0700" }, "committer": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Wed Oct 07 11:27:32 2015 -0700" }, "message": "DO NOT MERGE - OMX: allow only secure codec to remotely call allocateBuffer.\n\nBug: 24310423\nChange-Id: Iebcfc58b447f925ec2134898060af2ef227266a3\n(cherry picked from commit 8dde7269a5356503d2b283234b6cb46d0c3f214e)\n" }, { "commit": "b90b8291e36ae079ac0ccd029bb6e6a987036f7c", "tree": "973ea7078c95ed0d8d029fd1dffa3ddbe6fd2528", "parents": [ "ee481c9b172f90f507d505c9b32620cc1d062c83", "cb70fdbe9be14002a4303a93f07a13c508c00d89" ], "author": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Tue Oct 06 02:55:19 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Oct 06 02:55:19 2015 +0000" }, "message": "am cb70fdbe: Merge \"OMX: allow only secure codec to remotely call allocateBuffer.\" into mnc-dev\n\n* commit \u0027cb70fdbe9be14002a4303a93f07a13c508c00d89\u0027:\n OMX: allow only secure codec to remotely call allocateBuffer.\n" }, { "commit": "4b710f086070fabe022b3a1f474bfcbec842b8fc", "tree": "d51001f392edfe4473a18f2075e2fc72445d64d6", "parents": [ "4bd8f46cf6d4a05361fdbdfb39510c0197b1f2ec" ], "author": { "name": "Ronghua Wu", "email": "ronghuawu@google.com", "time": "Mon Sep 14 15:44:04 2015 -0700" }, "committer": { "name": "Ronghua Wu", "email": "ronghuawu@google.com", "time": "Mon Oct 05 10:42:09 2015 -0700" }, "message": "libstagefright: don\u0027t reclaim codec when there\u0027s buffer owned\nby client.\nNotify the client and try to reclaim again in 0.5s.\n\nBug: 23703241\nBug: 23949540\nChange-Id: I1afe50c71635645668bfb73ffa0d801765b5ae3c\n" }, { "commit": "4802c0c507681634aee38518581a080bfa443ae2", "tree": "e184ee110c468c7ef4621e5e32a6b8bfeaab11d6", "parents": [ "4a8f4a3f567d8b3134b1c7ab21ca774f279ab9c2" ], "author": { "name": "Praveen Chavan", "email": "pchavan@codeaurora.org", "time": "Tue Sep 29 02:25:47 2015 -0700" }, "committer": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Mon Oct 05 09:13:59 2015 -0700" }, "message": "AudioSystem: Fix race condition in accessing ioDescriptors\n\nThe vector mIoDescriptors can be simultaneouly modified\nand accessed by 2 threads. Acquire a lock while wrapping\nthe ioDescriptor in a sp\u003c\u003e\n\nBug: 24576810\n\nAuthor: Haynes Mathew George \u003chgeorge@codeaurora.org\u003e\n\nChange-Id: I73c79ef8eca092b500a7ead3a5ebd0bcf75f9920\n" }, { "commit": "8dde7269a5356503d2b283234b6cb46d0c3f214e", "tree": "06ec842433e8f501addbe9d264a46f2f21fd9161", "parents": [ "a9a899d3970f41162c8e9c720bf05f3e6226a90a" ], "author": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Mon Sep 28 11:32:23 2015 -0700" }, "committer": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Fri Oct 02 11:15:18 2015 -0700" }, "message": "OMX: allow only secure codec to remotely call allocateBuffer.\n\nBug: 24310423\nChange-Id: Iebcfc58b447f925ec2134898060af2ef227266a3\n" }, { "commit": "412fe56cd7cf7d73bc5d2bcc3f635bc650d18de9", "tree": "919a0a09510d53e39c23126f7d4760d761d954d6", "parents": [ "37ea1d0de9b7c9ffbfa7cb1895dcbf4a4f92803a" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Thu Aug 20 17:08:32 2015 -0700" }, "committer": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Fri Aug 21 17:41:43 2015 -0700" }, "message": "CameraService: Notify camera service proxy of device status\n\nSend the camera proxy service in system server updates to\ncamera device state: opened/closed/active/idle.\n\nBug: 23393557\nChange-Id: Id7c70f134821efa34af8f6e7b4caa4c2ab128ebc\n" }, { "commit": "02a65c4f599035bf6d58ceda766311f8cb188ba3", "tree": "ee6b8c9a55375e1585a567ac94ba579007f1d49d", "parents": [ "612cf86e53f48cd347cf9b5a87e1d91d3d1dc601", "8910f92aea5791f245da2c69a8c2ad3fb92bb310" ], "author": { "name": "Jon Larimer", "email": "jlarimer@google.com", "time": "Thu Aug 20 01:16:06 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Aug 20 01:16:06 2015 +0000" }, "message": "am 8910f92a: am 2ea335b1: am fecbc5da: am 5b4a5cce: Merge \"do not dequeue from native window after we hit fatal error -- DO NOT MERGE\" into lmp-dev\n\n* commit \u00278910f92aea5791f245da2c69a8c2ad3fb92bb310\u0027:\n do not dequeue from native window after we hit fatal error -- DO NOT MERGE\n" }, { "commit": "27362395cec5673a9cbfe7179ad5490c4e475329", "tree": "e157babb6cdfb2579d9382b2ce2db7da23908611", "parents": [ "6035c811849a8475697268cf71b5cf923705abe8", "2ed42aea9c6fbca4bde52d647ff082b997b5968c" ], "author": { "name": "Jon Larimer", "email": "jlarimer@google.com", "time": "Tue Aug 18 15:13:39 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Aug 18 15:13:39 2015 +0000" }, "message": "am 2ed42aea: Merge \"do not dequeue from native window after we hit fatal error -- DO NOT MERGE\" into klp-dev\n\n* commit \u00272ed42aea9c6fbca4bde52d647ff082b997b5968c\u0027:\n do not dequeue from native window after we hit fatal error -- DO NOT MERGE\n" }, { "commit": "2ea335b11c1e328896a6c7a2e6d2bc190b7f06fc", "tree": "b12bf3da1c3457982ccff6c6d4aeb24d90ffb639", "parents": [ "afa0e3698355f341009a8042d62c82016f86a1c8", "fecbc5da64a992f91f74ef6c67a7e247b0da7777" ], "author": { "name": "Jon Larimer", "email": "jlarimer@google.com", "time": "Tue Aug 18 15:13:19 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Aug 18 15:13:19 2015 +0000" }, "message": "am fecbc5da: am 5b4a5cce: Merge \"do not dequeue from native window after we hit fatal error -- DO NOT MERGE\" into lmp-dev\n\n* commit \u0027fecbc5da64a992f91f74ef6c67a7e247b0da7777\u0027:\n do not dequeue from native window after we hit fatal error -- DO NOT MERGE\n" }, { "commit": "5d1103e5a229401a4c4e0cb7dd91b2742881ff92", "tree": "ac815f1a2ee6af6deb53754a149d31a6b3eac34a", "parents": [ "5f7d4b957a4b41eaee3bcfbe8cb5a2f8f3dc8dc0", "c78ac26e3a65328fc0118f16ee76a800d0687eb7" ], "author": { "name": "Ruben Brunk", "email": "rubenbrunk@google.com", "time": "Mon Aug 17 17:28:11 2015 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Aug 17 17:28:11 2015 +0000" }, "message": "Merge \"Add experimental camera session prepare API.\" into mnc-dr-dev" }, { "commit": "bf47eb9c67ed364f3c288954857aab9d9311db4c", "tree": "5ba3da2bb1e2103a1719e9c014dfb290392ff0b1", "parents": [ "e4ac35fa524b011f272d396b2c12515382bddb94" ], "author": { "name": "Chong Zhang", "email": "chz@google.com", "time": "Fri Aug 14 13:50:02 2015 -0700" }, "committer": { "name": "Chong Zhang", "email": "chz@google.com", "time": "Mon Aug 17 17:14:50 2015 +0000" }, "message": "do not dequeue from native window after we hit fatal error -- DO NOT MERGE\n\nbug: 22845824\nChange-Id: I8c375790c697e02b6ab3ea54b84d3f70d5e78141\n(cherry picked from commit 346de3c26a8fbd0fa0c8102f4a21ea4dcee4432a)\n" }, { "commit": "734e65e6e7e1ee863781c1ebd87003933bb4a752", "tree": "33fc593159d45ac2a84e93aa8c2d05583acfac65", "parents": [ "3ce293842fed1b3abd2ff0aecd2a0c70a55086ee" ], "author": { "name": "Chong Zhang", "email": "chz@google.com", "time": "Fri Aug 14 13:50:02 2015 -0700" }, "committer": { "name": "Chong Zhang", "email": "chz@google.com", "time": "Mon Aug 17 17:14:17 2015 +0000" }, "message": "do not dequeue from native window after we hit fatal error -- DO NOT MERGE\n\nbug: 22845824\nChange-Id: I8c375790c697e02b6ab3ea54b84d3f70d5e78141\n(cherry picked from commit 346de3c26a8fbd0fa0c8102f4a21ea4dcee4432a)\n" }, { "commit": "4883125b0df72ee404de8b244c3e6511f62947ee", "tree": "358b8cb0622b927674b413e0e07b7da6dd452e21", "parents": [ "bad4358c83c7daaf9eeb8542c15eea4f473c884c", "a89cfb6cab17700efa62665cda3bc4b87c6f1ad8" ], "author": { "name": "Chong Zhang", "email": "chz@google.com", "time": "Sat Aug 15 01:01:09 2015 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Sat Aug 15 01:01:09 2015 +0000" }, "message": "Merge \"do not dequeue from native window after we hit fatal error\" into mnc-dev" }, { "commit": "c78ac26e3a65328fc0118f16ee76a800d0687eb7", "tree": "9009e37c981c7cbfdd106c44de2622edf1672a49", "parents": [ "a09f8cf8c76fa946c4b91be059b420941abcdc3b" ], "author": { "name": "Ruben Brunk", "email": "rubenbrunk@google.com", "time": "Thu Aug 13 17:58:46 2015 -0700" }, "committer": { "name": "Ruben Brunk", "email": "rubenbrunk@google.com", "time": "Fri Aug 14 17:30:24 2015 -0700" }, "message": "Add experimental camera session prepare API.\n\nBug: 18949148\nChange-Id: I8f73e68ea2e3acc60d98954106f364d13f439a82\n" }, { "commit": "bad4358c83c7daaf9eeb8542c15eea4f473c884c", "tree": "0b01065e69f769a7dc058b8ac6652ef93d4736ed", "parents": [ "49f0246c2eac50bbfebf48316b1086de64ac9860" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Fri Aug 14 13:12:32 2015 -0700" }, "committer": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Fri Aug 14 16:02:03 2015 -0700" }, "message": "Camera: Add camera type to ICameraService.getNumberOfCameras.\n\nAlso determine the number of \u0027normal\u0027 cameras present on\ncamera service startup, and ensure that all normal cameras have\nIDs lower than the \u0027strange\u0027 cameras.\n\nBug: 23194168\nChange-Id: I1f7b14825cb52707de698a955f85da1eaa932663\n" }, { "commit": "a89cfb6cab17700efa62665cda3bc4b87c6f1ad8", "tree": "397cbabac6f864c1c8841d584ad08d4261a73795", "parents": [ "49f0246c2eac50bbfebf48316b1086de64ac9860" ], "author": { "name": "Chong Zhang", "email": "chz@google.com", "time": "Fri Aug 14 13:50:02 2015 -0700" }, "committer": { "name": "Chong Zhang", "email": "chz@google.com", "time": "Fri Aug 14 21:59:17 2015 +0000" }, "message": "do not dequeue from native window after we hit fatal error\n\nbug: 22845824\nChange-Id: I8c375790c697e02b6ab3ea54b84d3f70d5e78141\n(cherry picked from commit 346de3c26a8fbd0fa0c8102f4a21ea4dcee4432a)\n" }, { "commit": "e0e37e13bc9e62e58484d1e54e66eaf506744548", "tree": "004b73ebbe0fdfb5ff41d6f340e0274f6b34512c", "parents": [ "821b6c29d3d5782ae17aedc77f406c9eaf2ab2fb", "48192b84db39879e7d83a2f4e7023048fb81ee8e" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Fri Aug 07 16:36:08 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Aug 07 16:36:08 2015 +0000" }, "message": "am 48192b84: am 0625841d: am dfaea255: am 578d5b66: am 171b5fad: am d6ea7f65: am f26400c9: Fix crash on malformed id3\n\n* commit \u002748192b84db39879e7d83a2f4e7023048fb81ee8e\u0027:\n Fix crash on malformed id3\n" }, { "commit": "48192b84db39879e7d83a2f4e7023048fb81ee8e", "tree": "da2e27ff472d39842ee796d3523785036acd6d42", "parents": [ "9ac30bd4a43e025ce27c0a78bbe2ac05a66bcbda", "0625841daae5bb1351034909ce705aab517eea2d" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Fri Aug 07 15:01:52 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Aug 07 15:01:52 2015 +0000" }, "message": "am 0625841d: am dfaea255: am 578d5b66: am 171b5fad: am d6ea7f65: am f26400c9: Fix crash on malformed id3\n\n* commit \u00270625841daae5bb1351034909ce705aab517eea2d\u0027:\n Fix crash on malformed id3\n" }, { "commit": "dfaea255546340742b42c216663f61c6b7301c4f", "tree": "7e77aeb1072938040bab56ba4a9ed6b48c0a8473", "parents": [ "fbf1c8d65fe257847b35ec7289f9450ac34c8034", "578d5b66fc9f5e36ca0cb19b21771aa85ec131ee" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Fri Aug 07 14:47:48 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Aug 07 14:47:48 2015 +0000" }, "message": "am 578d5b66: am 171b5fad: am d6ea7f65: am f26400c9: Fix crash on malformed id3\n\n* commit \u0027578d5b66fc9f5e36ca0cb19b21771aa85ec131ee\u0027:\n Fix crash on malformed id3\n" }, { "commit": "171b5fadb9d304f5e06686e4f3d060ef335d7250", "tree": "8d45331766e9cb5c701db4a8ca4e51e89f1ac5ad", "parents": [ "d8bb17e33ef33ce173fa2d096211785145d41921", "d6ea7f65dd31d5dacf497cc3c494d4fa3910f7c3" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Fri Aug 07 14:32:40 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Aug 07 14:32:40 2015 +0000" }, "message": "am d6ea7f65: am f26400c9: Fix crash on malformed id3\n\n* commit \u0027d6ea7f65dd31d5dacf497cc3c494d4fa3910f7c3\u0027:\n Fix crash on malformed id3\n" }, { "commit": "d6ea7f65dd31d5dacf497cc3c494d4fa3910f7c3", "tree": "b62ef0d8d86dd5a159fda3997b7b7369ced8a96c", "parents": [ "42bd61d73e8b4d0b1101e73324a59fde51077112", "f26400c9d01a0e2f71690d5ebc644270f098d590" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Fri Aug 07 14:25:10 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Aug 07 14:25:10 2015 +0000" }, "message": "am f26400c9: Fix crash on malformed id3\n\n* commit \u0027f26400c9d01a0e2f71690d5ebc644270f098d590\u0027:\n Fix crash on malformed id3\n" }, { "commit": "f26400c9d01a0e2f71690d5ebc644270f098d590", "tree": "b96386b9c3bf83c969ed207dbd7b53eb29e6c6a3", "parents": [ "d9a9a324766b26be2ff0d10537ea0b215b0261e3" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Tue Aug 04 16:49:28 2015 -0700" }, "committer": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Tue Aug 04 23:52:34 2015 +0000" }, "message": "Fix crash on malformed id3\n\nBug: 22954006\nChange-Id: I488cb1e2c69fc7043b6040481b30fa866000515d\n" }, { "commit": "f42917964a76720932b23e67a05d034cd0cf346b", "tree": "79937def38a4341e9eadf978a6265bb24839cff1", "parents": [ "70c1f74f3d4c43b67949f3e742195d60f4677462" ], "author": { "name": "Chong Zhang", "email": "chz@google.com", "time": "Tue Jul 28 17:56:36 2015 -0700" }, "committer": { "name": "Chong Zhang", "email": "chz@google.com", "time": "Tue Jul 28 17:59:15 2015 -0700" }, "message": "add GRALLOC_USAGE_HW_COMPOSER flag to video usage bits\n\nbug: 22657091\nChange-Id: I6a11bc15bba34035ef31c2f4d41196ece60d4ad9\n" } ], "next": "f87d8341df3445fb4931a39deec2ec1d00c30918" }