)]}' { "log": [ { "commit": "911b808a6568fee9c2fd1aa89039161195873350", "tree": "2cf0040efd5adab12955bda5b07680238aee9853", "parents": [ "36af5d03196ce1ce41c753cdd63931072d2044ea", "58af3de44d17e6ba716178e147474a20765c1441" ], "author": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Mar 04 00:24:25 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Mar 04 00:24:25 2020 +0000" }, "message": "[DO NOT MERGE] Fix uninitialized data in IHDCP decrypt am: 58af3de44d\n\nChange-Id: I0678c337a6acc5c7b8f355852b43bf8434652143\n" }, { "commit": "58af3de44d17e6ba716178e147474a20765c1441", "tree": "9b775304945d9b8efd68eb2076c5928f5a39be97", "parents": [ "e4e7b91ec85c3b3bdeb74994a68f4bff0f26aefc" ], "author": { "name": "Chong Zhang", "email": "chz@google.com", "time": "Thu Feb 27 10:20:17 2020 -0800" }, "committer": { "name": "Chong Zhang", "email": "chz@google.com", "time": "Thu Feb 27 20:50:25 2020 +0000" }, "message": "[DO NOT MERGE] Fix uninitialized data in IHDCP decrypt\n\nbug: 150156584\ntest: build\nChange-Id: Ia4ab8e4b4db0b895d0ca36592c0469adb3b89aac\n" }, { "commit": "093bba3a2e7e696cdad4fd20844bfb1739db7280", "tree": "b0a60cd8f79c1c6bf85a43b3b9e75bbb56f68687", "parents": [ "ebbcb99ca11fb09a39900da010f30e7ca8b7db30", "cf264f7d640548f81b30ec02d73e1fe623666164" ], "author": { "name": "ray-cy.lee", "email": "ray-cy.lee@mstarsemi.com", "time": "Mon Sep 24 22:16:05 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Mon Sep 24 22:16:05 2018 -0700" }, "message": "[automerger] CTS error while media dump() am: c20825bd3b am: 8a530ca738 am: ef7415221a am: 8cc5e57576 am: 2ab6f28542\nam: cf264f7d64\n\nChange-Id: I20c9dd975ea8f9a41cd6bc7a9eedff26e945188a\n" }, { "commit": "cf264f7d640548f81b30ec02d73e1fe623666164", "tree": "7a48d9094dd44e52d56a348230da35d1a130641d", "parents": [ "c927af1287e3b90d77e40aae26f4a3b61de3ac09", "2ab6f28542107bbea28a570d354eafbaa8ad63e1" ], "author": { "name": "Android Build Merger (Role)", "email": "noreply-android-build-merger@google.com", "time": "Tue Sep 11 18:09:07 2018 +0000" }, "committer": { "name": "Android Build Merger (Role)", "email": "noreply-android-build-merger@google.com", "time": "Tue Sep 11 18:09:07 2018 +0000" }, "message": "[automerger] CTS error while media dump() am: c20825bd3b am: 8a530ca738 am: ef7415221a am: 8cc5e57576 am: 2ab6f28542\n\nChange-Id: I39fcd04b17ad4af558bd37410e6cbdcdba783213\n" }, { "commit": "2ab6f28542107bbea28a570d354eafbaa8ad63e1", "tree": "bf79fa583f0a180178b55c60953c26c28e2c20bb", "parents": [ "1e3a02a61c1d381c365c5295fc2ced702df4d170", "8cc5e575764f0ad1eecbc80419ae814f2bac5dc5" ], "author": { "name": "Android Build Merger (Role)", "email": "noreply-android-build-merger@google.com", "time": "Tue Sep 11 18:09:05 2018 +0000" }, "committer": { "name": "Android Build Merger (Role)", "email": "noreply-android-build-merger@google.com", "time": "Tue Sep 11 18:09:05 2018 +0000" }, "message": "[automerger] CTS error while media dump() am: c20825bd3b am: 8a530ca738 am: ef7415221a am: 8cc5e57576\n\nChange-Id: Ic30487f023a17d487170aaf8199aa12d1f85d805\n" }, { "commit": "ef7415221aa4a96bac7739ad4632d8083907db4f", "tree": "9ad61ce71b685b16cc21f89566aeb274203e97fd", "parents": [ "eea2ec03a47164952c309be720f72012521e40bb", "8a530ca73830c214c01d04a0547480ede786783f" ], "author": { "name": "Android Build Merger (Role)", "email": "noreply-android-build-merger@google.com", "time": "Tue Sep 11 18:09:02 2018 +0000" }, "committer": { "name": "Android Build Merger (Role)", "email": "noreply-android-build-merger@google.com", "time": "Tue Sep 11 18:09:02 2018 +0000" }, "message": "[automerger] CTS error while media dump() am: c20825bd3b am: 8a530ca738\n\nChange-Id: Ibcd8860289456ce0fce9fd1a7376508ffef06b2e\n" }, { "commit": "8a530ca73830c214c01d04a0547480ede786783f", "tree": "ff005178f3ef8bf76a5c08b6572c88596ac6b0d7", "parents": [ "c88022c3de609a177fc595eea128697fd791d3f0", "c20825bd3b751cffcd8d7e66e97c3b1a91ef21e0" ], "author": { "name": "Android Build Merger (Role)", "email": "noreply-android-build-merger@google.com", "time": "Tue Sep 11 18:09:00 2018 +0000" }, "committer": { "name": "Android Build Merger (Role)", "email": "noreply-android-build-merger@google.com", "time": "Tue Sep 11 18:09:00 2018 +0000" }, "message": "[automerger] CTS error while media dump() am: c20825bd3b\n\nChange-Id: I749052142196bbaa9168db64ec8ff50df84b41e0\n" }, { "commit": "c20825bd3b751cffcd8d7e66e97c3b1a91ef21e0", "tree": "724a8230099ba0c94d035605c998dd49aad104bf", "parents": [ "ecb2df5bc0c13fc7d7370f27017178111cd7727e" ], "author": { "name": "ray-cy.lee", "email": "ray-cy.lee@mstarsemi.com", "time": "Tue Mar 07 18:25:15 2017 +0800" }, "committer": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Tue Sep 11 18:08:58 2018 +0000" }, "message": "CTS error while media dump()\n\nMediaExtractor should not dump information. CTS is\nchecking and failing due to the dump.\n\nBug: 114770654\nChange-Id: Ie5bae5de39545dede6da4198240b4f38c50050b7\n" }, { "commit": "1e3a02a61c1d381c365c5295fc2ced702df4d170", "tree": "6bd71d1dd8fbd30f6b5ddf471393ba66c76b676b", "parents": [ "4572777872c494ca442ff433d448cbecb94bb11d", "949bb9853554f36e9887d26c75d322d426453bdb" ], "author": { "name": "Android Build Merger (Role)", "email": "noreply-android-build-merger@google.com", "time": "Wed Aug 15 03:06:11 2018 +0000" }, "committer": { "name": "Android Build Merger (Role)", "email": "noreply-android-build-merger@google.com", "time": "Wed Aug 15 03:06:11 2018 +0000" }, "message": "[automerger] Fix information disclosure in mediadrmserver DO NOT MERGE am: ecb2df5bc0 am: c88022c3de am: eea2ec03a4 am: 949bb98535\n\nChange-Id: I52549e142d262a3c32996d2a70b86963e1e79a37\n" }, { "commit": "eea2ec03a47164952c309be720f72012521e40bb", "tree": "8bb86d7475ff281334c73b87b024f6a2fa0d77ee", "parents": [ "1d1379f47dd975f9e9a86940e927e0ca5335d70e", "c88022c3de609a177fc595eea128697fd791d3f0" ], "author": { "name": "Android Build Merger (Role)", "email": "noreply-android-build-merger@google.com", "time": "Wed Aug 15 03:06:08 2018 +0000" }, "committer": { "name": "Android Build Merger (Role)", "email": "noreply-android-build-merger@google.com", "time": "Wed Aug 15 03:06:08 2018 +0000" }, "message": "[automerger] Fix information disclosure in mediadrmserver DO NOT MERGE am: ecb2df5bc0 am: c88022c3de\n\nChange-Id: I216ce9065f3a5ecd26add57b7f9bad8d16fe330d\n" }, { "commit": "c88022c3de609a177fc595eea128697fd791d3f0", "tree": "9fff71d8322145d1c4f23a9622ef1750b1e670c3", "parents": [ "fe8dc06116d0a172774a226158458443a76e6ccb", "ecb2df5bc0c13fc7d7370f27017178111cd7727e" ], "author": { "name": "Android Build Merger (Role)", "email": "noreply-android-build-merger@google.com", "time": "Wed Aug 15 03:06:06 2018 +0000" }, "committer": { "name": "Android Build Merger (Role)", "email": "noreply-android-build-merger@google.com", "time": "Wed Aug 15 03:06:06 2018 +0000" }, "message": "[automerger] Fix information disclosure in mediadrmserver DO NOT MERGE am: ecb2df5bc0\n\nChange-Id: Iba22b0efec9ee75ee535c10a0415b4a1e70adfb0\n" }, { "commit": "ecb2df5bc0c13fc7d7370f27017178111cd7727e", "tree": "e66dcaed5aad58f42f4e47d30adb1a983173ecd2", "parents": [ "d1fd02761236b35a336434367131f71bef7405c9" ], "author": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Fri Jul 13 16:58:04 2018 -0700" }, "committer": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Wed Aug 15 03:06:05 2018 +0000" }, "message": "Fix information disclosure in mediadrmserver DO NOT MERGE\n\nTest:POC provided in bug\nBug:79218474\nChange-Id: Ida9323dc1939e3c6e9fffe302bc8284d181817a7\n" }, { "commit": "9ac536d2ef0e90656201db895dc8a6f33736452e", "tree": "672e8cfbbb1a34775c86f702d5d9ff99dd3d2435", "parents": [ "af7ec75b23529514f08041662b6875bfde471da3", "20e00b3f96d564277a244625b6d15d8671c64be5" ], "author": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Fri May 11 12:42:31 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri May 11 12:42:31 2018 -0700" }, "message": "Merge \"Fix security vulnerability in CryptoHal\" into oc-dev\nam: 20e00b3f96\n\nChange-Id: I55c59bfe9a1d1e2444e4c5d7b244a0a99dae2b04\n" }, { "commit": "9a9c3ab4d76f03f3abb3756bca9cdfe55c74326a", "tree": "83e6850acd836e6da37b6eaf9fed9bb0e36eb26b", "parents": [ "2b37975b8904ef25b2fd42db442e286ea1d48299" ], "author": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Thu Apr 19 16:23:21 2018 -0700" }, "committer": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Fri May 11 16:40:17 2018 +0000" }, "message": "Fix security vulnerability in CryptoHal\n\nCryptoHal was not checking that the memory heap set by setHeap\nwas the same one that was actually used for the decrypt call, allowing\nthe caller to spoof the decrypt call into accessing arbitrary memory.\n\nbug:76221123\ntest: mediadrmserverpoc included in the bug \u0026 GTS media tests\nChange-Id: I35214a1a6d0a4b864123e147d1a1adc2377bfbc5\nMerged-in: I4ae6d1080be406bf53e3617c59c75206cc5066c6\n" }, { "commit": "2f8f0ac61491e258d05a75a4a3044821bbd1cf9b", "tree": "2757e786aa6fc76411ad4b7fc4cfc57fb5d741ed", "parents": [ "e7a37a93304ee346ea8f396266d3b1223ac7c231", "2bc2ace946141ade24bc92d71a206b4827be12b7" ], "author": { "name": "Android Build Merger (Role)", "email": "noreply-android-build-merger@google.com", "time": "Mon Apr 16 17:38:29 2018 +0000" }, "committer": { "name": "Android Build Merger (Role)", "email": "noreply-android-build-merger@google.com", "time": "Mon Apr 16 17:38:29 2018 +0000" }, "message": "[automerger] Sanitize effect descriptors for AudioPolicyService binder calls. am: 50a466610b am: 32e8258b67 am: 372796efb1 am: 035496d7ec am: bcc51ec8df am: 7a541948cb am: 18308ee195 am: 2bc2ace946\n\nChange-Id: I803ce8525026305596997972fe6121b245593923\n" }, { "commit": "18308ee1951429aaba5b433f5c6c07f0214aa5a3", "tree": "89ed9f0422e281c990f5e2b551f3dadcd65fb8ec", "parents": [ "ec2c7c27cbcfb42b7ec17a69a81e9c2538e30886", "7a541948cb05b0faa88e48f63d3447a0f2354c27" ], "author": { "name": "Android Build Merger (Role)", "email": "noreply-android-build-merger@google.com", "time": "Mon Apr 16 17:38:24 2018 +0000" }, "committer": { "name": "Android Build Merger (Role)", "email": "noreply-android-build-merger@google.com", "time": "Mon Apr 16 17:38:24 2018 +0000" }, "message": "[automerger] Sanitize effect descriptors for AudioPolicyService binder calls. am: 50a466610b am: 32e8258b67 am: 372796efb1 am: 035496d7ec am: bcc51ec8df am: 7a541948cb\n\nChange-Id: I0e9e6bc6b4ac23935a0ed1bf9f44e66e9b6bb7a6\n" }, { "commit": "7a541948cb05b0faa88e48f63d3447a0f2354c27", "tree": "35c642563e88e1d840d57faf9c5815411fb9b500", "parents": [ "4243e99120efc23ceaed2bfa3fdbb80f98b4705b", "bcc51ec8df4d4c125cb36d259ff2c205ca9d6f7d" ], "author": { "name": "Android Build Merger (Role)", "email": "noreply-android-build-merger@google.com", "time": "Mon Apr 16 17:38:22 2018 +0000" }, "committer": { "name": "Android Build Merger (Role)", "email": "noreply-android-build-merger@google.com", "time": "Mon Apr 16 17:38:22 2018 +0000" }, "message": "[automerger] Sanitize effect descriptors for AudioPolicyService binder calls. am: 50a466610b am: 32e8258b67 am: 372796efb1 am: 035496d7ec am: bcc51ec8df\n\nChange-Id: I4f1867eecd2cf1549f9a3dcb33f33fcea6164d51\n" }, { "commit": "bcc51ec8df4d4c125cb36d259ff2c205ca9d6f7d", "tree": "5c0ffe8ee993ec087e63be27c4747cb9886f1a7f", "parents": [ "bceb076a2e60fc2a2e9a6cf6469c8a52f6034b6d", "035496d7eccdde6b58c5574f76b2134d9d31a4a4" ], "author": { "name": "Android Build Merger (Role)", "email": "noreply-android-build-merger@google.com", "time": "Mon Apr 16 17:38:19 2018 +0000" }, "committer": { "name": "Android Build Merger (Role)", "email": "noreply-android-build-merger@google.com", "time": "Mon Apr 16 17:38:19 2018 +0000" }, "message": "[automerger] Sanitize effect descriptors for AudioPolicyService binder calls. am: 50a466610b am: 32e8258b67 am: 372796efb1 am: 035496d7ec\n\nChange-Id: I921d02e2c93c953f1e4849915cf616828cbc1dbe\n" }, { "commit": "32e8258b6721e5aed0e593a1501d50e2be7c73e5", "tree": "fd3d394d17fb1f8cb4652ee12178fc52a7fb9f53", "parents": [ "96cb2ef5ddef545efbe486e7446644ef8c447375", "50a466610b526271b8a34cd48e21ef8637b2d1c9" ], "author": { "name": "Android Build Merger (Role)", "email": "noreply-android-build-merger@google.com", "time": "Mon Apr 16 17:38:14 2018 +0000" }, "committer": { "name": "Android Build Merger (Role)", "email": "noreply-android-build-merger@google.com", "time": "Mon Apr 16 17:38:14 2018 +0000" }, "message": "[automerger] Sanitize effect descriptors for AudioPolicyService binder calls. am: 50a466610b\n\nChange-Id: Id53db848693baae61db3b674b75142c12ed899e5\n" }, { "commit": "50a466610b526271b8a34cd48e21ef8637b2d1c9", "tree": "d72e81e2cc856ec43ef9f79f321e16d9b037b641", "parents": [ "169e6aca1642d78aafff1e7c85d2ba0e111d53f5" ], "author": { "name": "Andy Hung", "email": "hunga@google.com", "time": "Thu Apr 12 11:06:56 2018 -0700" }, "committer": { "name": "Andy Hung", "email": "hunga@google.com", "time": "Fri Apr 13 11:41:01 2018 -0700" }, "message": "Sanitize effect descriptors for AudioPolicyService binder calls.\n\nZero initialize structs before parcel read, if status is not checked.\nSanitize parcel read audio_port_config.\n\nTest: Audio CTS, See bug for POC\nBug: 73126106\nMerged-in: Iece43eb463385927e6babcf93654eea8aaebc29c\nChange-Id: Iece43eb463385927e6babcf93654eea8aaebc29c\n" }, { "commit": "8347d50e63d8f92bbad06a844b744c4a376e16f7", "tree": "a53a509d39ab0754f67cb71f5932577c320bef93", "parents": [ "078f1de778951df0b9b5748e4ad103ad9489e59f", "b9d90149a970113e94b9005646c30f3f4ed096a9" ], "author": { "name": "Santhosh Behara", "email": "santhoshbehara@codeaurora.org", "time": "Thu Feb 08 20:44:37 2018 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Feb 08 20:44:37 2018 +0000" }, "message": "Merge \"libmedia: Fix null pointer crash in secure buffer allocation.\" into oc-dev\nam: b9d90149a9\n\nChange-Id: I78c237b954f053cd22faaf85aa8d84315172bec5\n" }, { "commit": "ddd508e96da76a3e2de3d8dfef16e4d0d07fbf9b", "tree": "da66e0a7b0dce02b3495a21cb085ad951b31c899", "parents": [ "5924e3db2428f8b9ffce07add57ab7a7ad879269" ], "author": { "name": "Santhosh Behara", "email": "santhoshbehara@codeaurora.org", "time": "Mon Oct 16 17:23:54 2017 +0530" }, "committer": { "name": "Pawin Vongmasa", "email": "pawin@google.com", "time": "Wed Jan 17 08:30:58 2018 +0000" }, "message": "libmedia: Fix null pointer crash in secure buffer allocation.\n\nAdd null pointer check for native_handle as it is null if\nsecure memory allocation fails.\n\nAuthor: Vasantha Balla\u003cvballa@codeaurora.org\u003e\n\nTest: fix the bug\nBug: 71053053\nMerged-In: I204ca69b9808448788c83a1ae5a642618eca8973\nChange-Id: I204ca69b9808448788c83a1ae5a642618eca8973\n(cherry picked from commit fad26c14c7e68c3fe40bda8fd5692b8dbfac1000)\n" }, { "commit": "85f65965a680b1405b13a520e61a3642352c3fb5", "tree": "54be27a12a8f4e819db9d1c1fcca69c34dbba776", "parents": [ "3c67b43de136e814c54bf47193e09e483253940a", "c352a035acd11ebfbe4490571c939135e5c35be9" ], "author": { "name": "Kevin Rocard", "email": "krocard@google.com", "time": "Mon Dec 04 18:25:27 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Mon Dec 04 18:25:27 2017 +0000" }, "message": "Merge \"IAudioPolicyService: Add attribute tags sanitization\" into mnc-dev am: f9131eab02 am: 4c30b6b2b8 am: f3c6fcc9ea am: 0ca72f6f22 am: 196094537b am: c4a8f51387 am: 902ec68f1c\nam: c352a035ac\n\nChange-Id: I5b83ebee185f6ec690c4feeb4c7749423f10a065\n" }, { "commit": "902ec68f1cfd200af5c024b472ee6d9a49603ee2", "tree": "f47c30a5150e31b2a44b21e1876eb9c5751a9bfc", "parents": [ "771e69f10d0f05fac22d8b43c13e6ec9c52b2f90", "c4a8f513873da6075a5f9d8d806ec395cbde0bf8" ], "author": { "name": "Kevin Rocard", "email": "krocard@google.com", "time": "Mon Dec 04 18:20:34 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Mon Dec 04 18:20:34 2017 +0000" }, "message": "Merge \"IAudioPolicyService: Add attribute tags sanitization\" into mnc-dev am: f9131eab02 am: 4c30b6b2b8 am: f3c6fcc9ea am: 0ca72f6f22 am: 196094537b\nam: c4a8f51387\n\nChange-Id: I16ce18833769ccadaaac5e15e61dcd9138e5490e\n" }, { "commit": "c4a8f513873da6075a5f9d8d806ec395cbde0bf8", "tree": "c534384cd1b4dbda07217753c2c2ca9193a6906c", "parents": [ "560028c73636f1e8c2ce41dad0c3ba555bad1d3b", "196094537bba7e9bb555ac1da293cf849a8d8a58" ], "author": { "name": "Kevin Rocard", "email": "krocard@google.com", "time": "Mon Dec 04 18:18:34 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Mon Dec 04 18:18:34 2017 +0000" }, "message": "Merge \"IAudioPolicyService: Add attribute tags sanitization\" into mnc-dev am: f9131eab02 am: 4c30b6b2b8 am: f3c6fcc9ea am: 0ca72f6f22\nam: 196094537b\n\nChange-Id: I2ff701d7da0971286656b653697d57661e1496b8\n" }, { "commit": "196094537bba7e9bb555ac1da293cf849a8d8a58", "tree": "d84d493d7ba6a3c1631fa8fc0dcb3ba9d1e27d0b", "parents": [ "5748b7788c502a5022e9d185cdef3e1d8d361672", "0ca72f6f2231fffa8834ba3776fe23ad01a8cbb1" ], "author": { "name": "Kevin Rocard", "email": "krocard@google.com", "time": "Mon Dec 04 18:15:54 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Mon Dec 04 18:15:54 2017 +0000" }, "message": "Merge \"IAudioPolicyService: Add attribute tags sanitization\" into mnc-dev am: f9131eab02 am: 4c30b6b2b8 am: f3c6fcc9ea\nam: 0ca72f6f22\n\nChange-Id: I8e3aad635bc018d6fb6159e7251eef2da41571be\n" }, { "commit": "4c30b6b2b8cf048e211a33dcbd95c6b7b89af81f", "tree": "3f0cccf23ba380bcc90f5c967c416ba622216df0", "parents": [ "0d22f58beef749c7484a5a9d18994035a41937e8", "f9131eab025f0d0b480c7ba8946d976adba63cf6" ], "author": { "name": "Kevin Rocard", "email": "krocard@google.com", "time": "Mon Dec 04 18:03:52 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Mon Dec 04 18:03:52 2017 +0000" }, "message": "Merge \"IAudioPolicyService: Add attribute tags sanitization\" into mnc-dev\nam: f9131eab02\n\nChange-Id: I6051f62ffc6565908b9af2e1f4cd4ed831263c3a\n" }, { "commit": "ab4d9f873ae433d75fbd7bd9af0aa4f7c3bcd92c", "tree": "84e5aa690c1dc01cf53faa6567715c8ba3aba38f", "parents": [ "9dcb25476e37d6738952f52c176b48e452c27d80" ], "author": { "name": "Kevin Rocard", "email": "krocard@google.com", "time": "Mon Nov 13 11:15:27 2017 -0800" }, "committer": { "name": "Kevin Rocard", "email": "krocard@google.com", "time": "Thu Nov 16 17:46:26 2017 -0800" }, "message": "IAudioPolicyService: Add attribute tags sanitization\n\nWhen audio_attributes_t was read from the binder parcel,\nthe string tags field was copied without checking that\nit contained a \u0027\\0\u0027.\n\nThis could lead to read past the end when tags were used.\n\nThis patch always adds a \u0027\\0\u0027 at the end of the buffer when\ndeserializing.\n\nBug: 68953950\nTest: manual playback/record\nTest: send binder payload without \\0 in tags attribute, check that only\n AUDIO_ATTRIBUTES_TAGS_MAX_SIZE - 1 char are printed.\nChange-Id: I285258cbf7cfaf26b191d1f31b3b1e2d724c4934\nMerged-In: I285258cbf7cfaf26b191d1f31b3b1e2d724c4934\nSigned-off-by: Kevin Rocard \u003ckrocard@google.com\u003e\n" }, { "commit": "b3a0e4680b276a1b2a8cce47f9eca1d7fe804c74", "tree": "fc2ec673d114186ea6e4d67f686380a2f3d67afb", "parents": [ "b18c345695cdf0b0f4ed7a4cbb4908e5943b130f", "e2f8930c3906bfe6cd6abdee898d4aa927acef33" ], "author": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Wed Oct 18 20:36:35 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Oct 18 20:36:35 2017 +0000" }, "message": "Fix information disclosure in mediadrmserver am: b41a527176 am: 70dc77cc94 am: e41b49b5ea am: 470e03a10b am: d1e097f456 am: 32ae22ff0f am: 4e55c5aae0 am: 88e846c4e7 am: acfb40f741\nam: e2f8930c39\n\nChange-Id: I1b7dfd7310baabb5d819ead53d4e7a0ce4218267\n" }, { "commit": "acfb40f741f2aa4891405a62561738764210a123", "tree": "d1c935086887ffa3c28610ba71680139d6b75cfe", "parents": [ "1c2ff96c7d79c7e8d6c256f3665b499adac610db", "88e846c4e763f2a221cffc5ecdaef9b6cbdc089a" ], "author": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Wed Oct 18 20:03:50 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Oct 18 20:03:50 2017 +0000" }, "message": "Fix information disclosure in mediadrmserver am: b41a527176 am: 70dc77cc94 am: e41b49b5ea am: 470e03a10b am: d1e097f456 am: 32ae22ff0f am: 4e55c5aae0\nam: 88e846c4e7\n\nChange-Id: I1987c61f62fb57f452f533d4f674c1cff1f0cbf2\n" }, { "commit": "88e846c4e763f2a221cffc5ecdaef9b6cbdc089a", "tree": "325c379bc2595c026a68a3b9a71e9cafe16e2ac0", "parents": [ "19594343c6bcf4e19da4e2fb2269d17f0c1c6639", "4e55c5aae0b21a5e92d7e3a41f904dd067c0d0b3" ], "author": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Wed Oct 18 19:35:25 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Oct 18 19:35:25 2017 +0000" }, "message": "Fix information disclosure in mediadrmserver am: b41a527176 am: 70dc77cc94 am: e41b49b5ea am: 470e03a10b am: d1e097f456 am: 32ae22ff0f\nam: 4e55c5aae0\n\nChange-Id: Ifb5687563b3e0425111abdae95bc88ea94480878\n" }, { "commit": "4e55c5aae0b21a5e92d7e3a41f904dd067c0d0b3", "tree": "7aa152713d17d823c2e3321415ae10c09e5a51b1", "parents": [ "5a5be673066e4e6f74ad81530412ecae9b5b2767", "32ae22ff0f53ae1d838f06483b3b28de4da62731" ], "author": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Wed Oct 18 19:24:17 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Oct 18 19:24:17 2017 +0000" }, "message": "Fix information disclosure in mediadrmserver am: b41a527176 am: 70dc77cc94 am: e41b49b5ea am: 470e03a10b am: d1e097f456\nam: 32ae22ff0f\n\nChange-Id: Ifc48f7176ab62b35f016cef26fd35e5e273d5364\n" }, { "commit": "470e03a10b3179a4c38e86b5ca99b8720c1a9a80", "tree": "d9d1e05aa9fc0ff48c72a532323a272782e98d9b", "parents": [ "c52190750e73458016150e6dc969447d76e55ce5", "e41b49b5ea0c881b5db04d74071bfddbc9bc388d" ], "author": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Wed Oct 18 18:37:37 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Oct 18 18:37:37 2017 +0000" }, "message": "Fix information disclosure in mediadrmserver am: b41a527176 am: 70dc77cc94\nam: e41b49b5ea\n\nChange-Id: I535fa9de1021f3bb3042905275984d7fdc73baee\n" }, { "commit": "e41b49b5ea0c881b5db04d74071bfddbc9bc388d", "tree": "657fdfb638ee18ee86ac530dc908ba524a2d44da", "parents": [ "7648415fc8a6afd9f02bef96081f0ba1f2af0cb6", "70dc77cc94c285236e9fff50dbaefaf20b5528eb" ], "author": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Wed Oct 18 18:23:23 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Oct 18 18:23:23 2017 +0000" }, "message": "Fix information disclosure in mediadrmserver am: b41a527176\nam: 70dc77cc94\n\nChange-Id: I1f9148571954ffc8e3727e90f6d84f039a8ddd5c\n" }, { "commit": "e79b2f044ca7beab7ad0996abd7f7dc1d117fa15", "tree": "6ee9142e638c6c062b50e689be535dd5cb00f21b", "parents": [ "8dc2a5fdfb05be6f5add3ff30eda761ca8d178b3", "45a05eb56787ee0db3712fbe1ec9384740b2eb15" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Tue Oct 10 21:02:10 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Oct 10 21:02:10 2017 +0000" }, "message": "Merge changes from topic \"b23270724\" into nyc-dev\nam: 45a05eb567\n\nChange-Id: Iee4799062b31b85d92fd2a1ca9ca1000839bc7e6\n" }, { "commit": "70dc77cc94c285236e9fff50dbaefaf20b5528eb", "tree": "0b7001d779ffaa9ab927bb4c5c47ea87d29ec41f", "parents": [ "643dd1d8d4e8aa64dcefc7e4cfbd6c2486090e06", "b41a527176b659c5ddfc734838df7607a6af80c9" ], "author": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Tue Oct 10 19:02:45 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Oct 10 19:02:45 2017 +0000" }, "message": "Fix information disclosure in mediadrmserver\nam: b41a527176\n\nChange-Id: Iee7d26d93e639cc7b7e0bb3de8b788090822a609\n" }, { "commit": "b41a527176b659c5ddfc734838df7607a6af80c9", "tree": "97f65bb081c16c90cfa5c6b38571e7102dbb6552", "parents": [ "c41471f6dff4825a27e6e26a0b5b480761572849" ], "author": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Mon Oct 09 11:52:18 2017 -0700" }, "committer": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Mon Oct 09 21:42:39 2017 -0700" }, "message": "Fix information disclosure in mediadrmserver\n\nTest:poc provided in bug\nbug:62872384\nChange-Id: I3d104a2a64a0cb81e9fd5b04c4def1fbee64da2d\n" }, { "commit": "50a6f88bc3cea96152ccf56e85a743be14aa39b0", "tree": "295a1d1f1e9d2413a71ad342cd2b3cc15199a0fb", "parents": [ "af6aa6e3fa7e5a0651b1412b9d32d4eca5533759" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Mon Dec 19 14:06:30 2016 -0800" }, "committer": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Fri Sep 15 10:41:18 2017 -0700" }, "message": "Fix issues with extractor dumpsys\n\nTracks and descriptions were added to their respective lists in\nopposite order, so dumpsys could mix up the format and active\nstate for a given track. Also fix potential NULL pointer dereference.\n\nBug: 33179012\nBug: 23270724\nChange-Id: I700d535da0e72f5641bf9257a34fdb5d5d068b12\n" }, { "commit": "447c6864051d8a56bc2e85b5e4347f2b66403e79", "tree": "da294c7597c10bee2216663cef95a77a210f0c42", "parents": [ "dce2faae4ff893d0b9bd356200d58a5dbc734d92", "ae73886c4d2f2dfd515def64a8882e069e612d90" ], "author": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Fri Jul 14 23:50:35 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Jul 14 23:50:35 2017 +0000" }, "message": "Merge \"MPEG4Extractor: ensure returned status is checked.\" into nyc-dev am: 02772b134e am: 2aa463e371 am: 4fa11b6cdf\nam: ae73886c4d\n\nChange-Id: I14a582f7890104d20ed8ad2336feaaf640d60bec\n" }, { "commit": "4fa11b6cdff4fccfa79e5dee2e5936c08f829a0c", "tree": "244dd3f2fa6912e953133f9eb969fd5b9956e255", "parents": [ "389c6ede46997fa4df8e3b29cbaa7cbc01248b76", "2aa463e371745f892d7dfccdadb1c3f30b221e75" ], "author": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Fri Jul 14 23:38:29 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Jul 14 23:38:29 2017 +0000" }, "message": "Merge \"MPEG4Extractor: ensure returned status is checked.\" into nyc-dev am: 02772b134e\nam: 2aa463e371\n\nChange-Id: Iba2670e0f394c1a8058008904d7cc4f01fe317a7\n" }, { "commit": "2aa463e371745f892d7dfccdadb1c3f30b221e75", "tree": "56924c9deb494a3347327abd3d5d57c58d20610b", "parents": [ "c36cdf16a9f30c15419a4463eb8bdf324ff1eb97", "02772b134e55343fef2cf8ed6f905c735f59a269" ], "author": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Fri Jul 14 23:34:32 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Jul 14 23:34:32 2017 +0000" }, "message": "Merge \"MPEG4Extractor: ensure returned status is checked.\" into nyc-dev\nam: 02772b134e\n\nChange-Id: If99cab67ff6f06551da5b6202d7d36c2854ff3a9\n" }, { "commit": "72840f22161a5e9bdf30b29c3a65762438103d82", "tree": "6d5cd8a1dd38f867eb844775ee638619b144cb36", "parents": [ "be01ebd598668b3dbd65137dba5a32064c3c42c1", "80059d44c4f88bec2b587a6482edca7816c28307" ], "author": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Fri Jul 14 23:34:32 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Jul 14 23:34:32 2017 +0000" }, "message": "Merge \"DO NOT MERGE: MPEG4Extractor: ensure returned status is checked.\" into mnc-dev\nam: 80059d44c4\n\nChange-Id: I1d598f9f0bc506f2ea20b82d070ed69ec35876ee\n" }, { "commit": "0addb449566857af3f62499fe7056dfba3400a2e", "tree": "a33b0fb4c403ee1cb02ccbe90fa1cee88c020b87", "parents": [ "a67eacace769095eb04b01681c99d931e68a4b08" ], "author": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Tue Feb 14 17:07:24 2017 -0800" }, "committer": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Fri Jun 30 11:16:38 2017 -0700" }, "message": "DO NOT MERGE: MPEG4Extractor: ensure returned status is checked.\n\nAlso fix handling of zero atom size in MPEG4Source::parseChunk.\nIDataSource: ensure readAt returns correct status.\nTest: manually test with mediaplayer.\nBug: 34718515\nChange-Id: I1219ec579aa0876dc1230e36af46b158b84c6d77\n\n(cherry picked from commit ff1fb4d5cdd3b2b28c69edd8cd3021e335ca381a)\n" }, { "commit": "371561214467f848496928914f771703d6c331e6", "tree": "05c8e7ddaff0ad3ed78a39a84beff243464405ad", "parents": [ "b56bc9e7621aa35eb4c3bceb4dcaa18e2d250c51" ], "author": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Tue Feb 14 17:07:24 2017 -0800" }, "committer": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Fri Jun 30 11:15:41 2017 -0700" }, "message": "MPEG4Extractor: ensure returned status is checked.\n\nAlso fix handling of zero atom size in MPEG4Source::parseChunk.\nIDataSource: ensure readAt returns correct status.\nTest: manually test with mediaplayer.\nBug: 34718515\nChange-Id: I1219ec579aa0876dc1230e36af46b158b84c6d77\n\n(cherry picked from commit ff1fb4d5cdd3b2b28c69edd8cd3021e335ca381a)\n" }, { "commit": "5550640fcb161f8329646ae959034251023884cc", "tree": "acb4bf17cc07cf8193c5b6cdb05a0d0420072ef6", "parents": [ "cb316c7ecc5520aa861f26e6f52114e5e5e9a902" ], "author": { "name": "Steven Moreland", "email": "smoreland@google.com", "time": "Wed Jun 07 18:18:09 2017 -0700" }, "committer": { "name": "Steven Moreland", "email": "smoreland@google.com", "time": "Mon Jun 26 16:09:46 2017 +0000" }, "message": "Fix OMX dependencies.\n\nNote, filed b/62923763 to cleanup xmlparser includes.\n\nBug: 37343418\nTest: builds with BOARD_VNDK_VERSION\u003dcurrent\nTest: (sanity) YouTube on a device\nTest: (sanity) Camera on a device\nTest: (sanity) watch (part of a) movie on a device\nTest: (sanity) YouTube on marlin\nTest: (sanity) Camera on marlin\nTest: (sanity) watch (part of a) movie on marlin\nTest: (sanity) YouTube on angler\nTest: (sanity) Camera on angler\nTest: (sanity) watch (part of a) movie on angler\n\n\nChange-Id: I461f999122da56cabb9d4d15b182899ced3b0120\n" }, { "commit": "525eac3e3b3b695b7f90798241e9283377b38557", "tree": "286ce16de20eefe1322ce714e5703a81e1b27d83", "parents": [ "de9075f88d70ddc192fa8ef9ad9c7c30d58dc253" ], "author": { "name": "Yifan Hong", "email": "elsk@google.com", "time": "Mon Jun 12 14:07:04 2017 -0700" }, "committer": { "name": "Yifan Hong", "email": "elsk@google.com", "time": "Mon Jun 12 14:09:28 2017 -0700" }, "message": "Fix libmedia_helper dependencies.\n\nTest: mma -j BOARD_VNDK_VERSION\u003dcurrent\nTest: m -j BOARD_VNDK_VERSION\u003dcurrent\nTest: m -j\n\nBug: 37342627\nChange-Id: Ic1f05716df3802f7ef93c1e452565b901d0d1df9\n" }, { "commit": "14972ed9c95d2ba24f7f49a0580c336fa478bd10", "tree": "8f8808cb74f597e3e6679abe91e6146baf80e326", "parents": [ "9e8f432a99d78191a42ffc070230d34ebf77102d", "360abaf9d7045bb125e0df414e82af1ef89681d0" ], "author": { "name": "Hassan Shojania", "email": "shojania@google.com", "time": "Mon Jun 05 19:04:00 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Mon Jun 05 19:04:00 2017 +0000" }, "message": "Merge \"Modular DRM for MediaPlayer: L3 playback fails at OMX mmap; preparDrm preparing\" into oc-dev am: 8631fd7b27\nam: 360abaf9d7\n\nChange-Id: Ib7dfcf5b854219276246bd6129bf2a0311990bde\n" }, { "commit": "360abaf9d7045bb125e0df414e82af1ef89681d0", "tree": "75c1764562c54d7f46d2255c1e82e05496f20e09", "parents": [ "88e94d3c1e3644d1c36b9e9c2f161cfe891ce4e1", "8631fd7b270e99ebee6ba056f4edd38e6bd4f93f" ], "author": { "name": "Hassan Shojania", "email": "shojania@google.com", "time": "Mon Jun 05 18:53:29 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Mon Jun 05 18:53:29 2017 +0000" }, "message": "Merge \"Modular DRM for MediaPlayer: L3 playback fails at OMX mmap; preparDrm preparing\" into oc-dev\nam: 8631fd7b27\n\nChange-Id: I88c8b84a400df2ed20e4e2017309634d8a725af4\n" }, { "commit": "838be3907fc58eab119d7093a3d73be7267bd4d2", "tree": "a669b7f03ce3ca7799aa7311240a49d0846c6755", "parents": [ "0375da69b221b05c3e44c49b1ad2f3b93a6bf2f9" ], "author": { "name": "Hassan Shojania", "email": "shojania@google.com", "time": "Tue May 23 14:14:24 2017 -0700" }, "committer": { "name": "Hassan Shojania", "email": "shojania@google.com", "time": "Thu Jun 01 12:21:03 2017 -0700" }, "message": "Modular DRM for MediaPlayer: L3 playback fails at OMX mmap; preparDrm preparing\n\nBug: 34559906\nBug: 38390836\nBug: 38039230\nBug: 62194380\n\nTest: GTS Tests\nChange-Id: I51e2479f745a4c3e271628abdd79efcb97368ec2\n" }, { "commit": "27d5fe5a9a4f958468c172bfd02ca954950e3e39", "tree": "35bd757c9bfdbc42299b3d564df1fbc0a549e9b3", "parents": [ "2f0b1312725d3efd2d218531e8b0707525cf5d63", "031977c9f3a4e4d070aa8f76e330d5e150c58ed5" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Wed May 24 18:47:02 2017 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed May 24 18:47:05 2017 +0000" }, "message": "Merge \"Fix clang-tidy performance warnings.\"" }, { "commit": "031977c9f3a4e4d070aa8f76e330d5e150c58ed5", "tree": "9e85d879edda9370c08079f0602fb76004db2c96", "parents": [ "64892d86d0ceba1042e48fc276f4988a2857fd1e" ], "author": { "name": "wy", "email": "yawanng@google.com", "time": "Fri May 12 15:37:23 2017 -0700" }, "committer": { "name": "Chih-hung Hsieh", "email": "chh@google.com", "time": "Wed May 24 16:45:36 2017 +0000" }, "message": "Fix clang-tidy performance warnings.\n\nBug: 30411878\nTest: build with WITH_TIDY\u003d1\n\nChange-Id: Ie0e60970d3633ec724d06be80501115aa5ff4a64\n" }, { "commit": "db4a3e576acf8e3f685ef23e6ecd56ae25c17938", "tree": "1cb5f33ea6aea9900c7bfcfc0de5ec0d073a1e1c", "parents": [ "20e8fc458ebe10c90935a9f602f49a11367132ad", "d6da847e360b068fdb901c6dc3e6eaa1d78a551d" ], "author": { "name": "Pawin Vongmasa", "email": "pawin@google.com", "time": "Tue May 23 00:53:50 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue May 23 00:53:50 2017 +0000" }, "message": "Merge \"Check the return value from allocateSecureBuffer\" into oc-dev am: 0375da69b2\nam: d6da847e36\n\nChange-Id: I485d69da0a2d1d1067a801ae0612396287160dfc\n" }, { "commit": "d6da847e360b068fdb901c6dc3e6eaa1d78a551d", "tree": "3de659145eb4e164a8b10d9047fae24f034afcfd", "parents": [ "310213428f932462e486854827fc9bfc3449c35f", "0375da69b221b05c3e44c49b1ad2f3b93a6bf2f9" ], "author": { "name": "Pawin Vongmasa", "email": "pawin@google.com", "time": "Tue May 23 00:46:45 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue May 23 00:46:45 2017 +0000" }, "message": "Merge \"Check the return value from allocateSecureBuffer\" into oc-dev\nam: 0375da69b2\n\nChange-Id: If510f661463d23de18dc127287db7593287304a4\n" }, { "commit": "0375da69b221b05c3e44c49b1ad2f3b93a6bf2f9", "tree": "7e49dc21fd87bfe36b9d31c3040ef20b6bf5f48f", "parents": [ "602f7d6ee9a080b4135a53b16200e1b738ff685e", "c7455a0bb4909d1d48c86e4a9b699ddda65f87f4" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Tue May 23 00:13:28 2017 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue May 23 00:13:30 2017 +0000" }, "message": "Merge \"Check the return value from allocateSecureBuffer\" into oc-dev" }, { "commit": "c7455a0bb4909d1d48c86e4a9b699ddda65f87f4", "tree": "3baaeb4a9ff53b5c432281d791db662574c3f426", "parents": [ "873b2bc8ec91ce1aa526004052347f253536ab6a" ], "author": { "name": "Pawin Vongmasa", "email": "pawin@google.com", "time": "Fri May 19 23:57:44 2017 -0700" }, "committer": { "name": "Pawin Vongmasa", "email": "pawin@google.com", "time": "Mon May 22 21:55:26 2017 +0000" }, "message": "Check the return value from allocateSecureBuffer\n\nTest: Small CtsMediaTestCases\n\nTest: com.google.android.media.gts.WidevineCodecStressTests in\nGtsMediaTestCases\n\nBug: 38452958\nChange-Id: Iba53c3fc144a3ee7d1f54b62ab3836b1a3a46dc6\n" }, { "commit": "4c2dd1c211b3671114aad0478fc6c6f7a8f7ee9f", "tree": "c325739484d2cc7b8feb36638241bde4e9ccfcd7", "parents": [ "e0d4f6479b411fd89284d437ad46d96e3046cd55", "d539f85e0244b7615eb150637cf4c6bd78febed6" ], "author": { "name": "Pawin Vongmasa", "email": "pawin@google.com", "time": "Sat May 20 04:08:53 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Sat May 20 04:08:53 2017 +0000" }, "message": "Merge \"Move media_profiles_V1_0.dtd to hardware/interfaces\" into oc-dev-plus-aosp\nam: d539f85e02\n\nChange-Id: I0e7b3c99368326ccab2a5547eb5bcb137477bf0f\n" }, { "commit": "a2ac39c899b7977b6fb903d62d9a78bfa7ca9dc7", "tree": "e6e7bee6428aa52bbc466fcc72502353789b8b88", "parents": [ "63296e3de4ad87575c2f23ea2f36fb376be4d719" ], "author": { "name": "Pawin Vongmasa", "email": "pawin@google.com", "time": "Wed May 17 18:32:18 2017 -0700" }, "committer": { "name": "Pawin Vongmasa", "email": "pawin@google.com", "time": "Fri May 19 01:12:18 2017 -0700" }, "message": "Move media_profiles_V1_0.dtd to hardware/interfaces\n\nTest: media_profiles_V1_0.dtd exists in system/etc\nBug: 36430270\nMerged-In: Ib3d1defcb17fa247bf1b1be7d3667cb086c86b4a\nChange-Id: Ib3d1defcb17fa247bf1b1be7d3667cb086c86b4a\n" }, { "commit": "08f4e4f6f9f73ea8e856c5328d3be8bad7f4c53e", "tree": "ab664a5775b2ea804f28acd0bbadfcbba6606000", "parents": [ "eaca4a1866e0b068a729ef777de13ef3e12ce7ba" ], "author": { "name": "Pawin Vongmasa", "email": "pawin@google.com", "time": "Wed May 17 18:32:18 2017 -0700" }, "committer": { "name": "Pawin Vongmasa", "email": "pawin@google.com", "time": "Thu May 18 20:42:11 2017 -0700" }, "message": "Move media_profiles_V1_0.dtd to hardware/interfaces\n\nTest: media_profiles_V1_0.dtd exists in system/etc\nBug: 36430270\nMerged-In: Ib3d1defcb17fa247bf1b1be7d3667cb086c86b4a\nChange-Id: Ib3d1defcb17fa247bf1b1be7d3667cb086c86b4a\n" }, { "commit": "65d96f774d9a01fd54fd2b3fbfaf21036ba321e6", "tree": "694721117ca344247bc4900e6832ee579577949f", "parents": [ "0148ea7b30b0f418a89b1f699d83c8e56407b123", "76f1cf0faa94b29c0d7debb5b560642fcf458e92" ], "author": { "name": "Pawin Vongmasa", "email": "pawin@google.com", "time": "Wed May 17 21:22:59 2017 -0700" }, "committer": { "name": "Pawin Vongmasa", "email": "pawin@google.com", "time": "Wed May 17 21:22:59 2017 -0700" }, "message": "resolve merge conflicts of 76f1cf0faa to oc-dev-plus-aosp\n\nTest: I solemnly swear I tested this conflict resolution.\n" }, { "commit": "0148ea7b30b0f418a89b1f699d83c8e56407b123", "tree": "2b4f5e77f83d594a37737806fa4db8088174345a", "parents": [ "3bf3fd67fdb1ab1cbbd5f1053330c555eea28d6a", "fec50ceef5be99f410de5feaa44494be4e10f4fb" ], "author": { "name": "Pawin Vongmasa", "email": "pawin@google.com", "time": "Wed May 17 21:10:57 2017 -0700" }, "committer": { "name": "Pawin Vongmasa", "email": "pawin@google.com", "time": "Wed May 17 21:14:02 2017 -0700" }, "message": "resolve merge conflicts of fec50ceef5 to oc-dev-plus-aosp\n\nTest: I solemnly swear I tested this conflict resolution.\nChange-Id: I9c3440e233196424a88138580c729601cc4cb761\n" }, { "commit": "b5bfa8fdd50307af30fd00b84bcd48e255fe908b", "tree": "dc7fc5c6484f338f923251fc943ab1d7e91a42f0", "parents": [ "d7db05b2fea5125d7833fa87a445ec819c54e10d" ], "author": { "name": "Pawin Vongmasa", "email": "pawin@google.com", "time": "Mon May 08 17:06:22 2017 -0700" }, "committer": { "name": "Pawin Vongmasa", "email": "pawin@google.com", "time": "Tue May 16 19:03:13 2017 -0700" }, "message": "Update schema for media_profiles_V1_0.xml\n\nTest: Small CtsMediaTestCases\nTest: \"xmllint --valid ...\" now produces no error\n\nBug: 36430270\nMerged-In: I1270a9357d444047f463e3da25510ae69930a451\nChange-Id: I1270a9357d444047f463e3da25510ae69930a451\n" }, { "commit": "d7db05b2fea5125d7833fa87a445ec819c54e10d", "tree": "9d961a880e4e030b4e1d4ec83f47852aa22902fa", "parents": [ "fec50ceef5be99f410de5feaa44494be4e10f4fb" ], "author": { "name": "Pawin Vongmasa", "email": "pawin@google.com", "time": "Wed May 03 04:19:20 2017 -0700" }, "committer": { "name": "Pawin Vongmasa", "email": "pawin@google.com", "time": "Tue May 16 19:02:39 2017 -0700" }, "message": "Add search paths for xml files for MediaProfiles\n\nThis CL also adds versions to xml files. The default name for\nthe xml file is changed from media_profiles.xml to\nmedia_profiles_V1_0.xml.\n\nTest: Small CtsMediaTestCases\nTest: Manual use of video recording and playback in Camera app\nBug: 36430270\nMerged-In: Idd0cd07f358fb4eda8ce5b31adf62a7313eccbbf\nChange-Id: Idd0cd07f358fb4eda8ce5b31adf62a7313eccbbf\n" }, { "commit": "fec50ceef5be99f410de5feaa44494be4e10f4fb", "tree": "c4377730cb7ac61af457f8a669901fb765b2b3ff", "parents": [ "c2bc4385fff526318caaecaa5dcc92479378bb73" ], "author": { "name": "Pawin Vongmasa", "email": "pawin@google.com", "time": "Wed May 03 15:43:59 2017 -0700" }, "committer": { "name": "Pawin Vongmasa", "email": "pawin@google.com", "time": "Tue May 16 19:00:08 2017 -0700" }, "message": "Add media_profiles_V1_0.dtd\n\nmedia_profiles_V1_0.dtd is the schema file for media_profiles_V1_0.xml.\n\nTest: media_profiles_V1_0.dtd exists in system/etc\n\nBug: 36430270\nMerged-In: If456618dfa73274c8e5b998818139840a5258ea8\nChange-Id: If456618dfa73274c8e5b998818139840a5258ea8\n" }, { "commit": "57834076bec71f4c134fc91976118e2701b81e92", "tree": "0ec0f451a06ff75180b25d925dd90ae76a27373f", "parents": [ "9ee3885b7da632d3c0320fbf38892b395d8fd8c7", "72ad8cb0aec92b818505a08765e44a56e9d2776a" ], "author": { "name": "Pawin Vongmasa", "email": "pawin@google.com", "time": "Wed May 10 11:58:49 2017 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed May 10 11:58:55 2017 +0000" }, "message": "Merge \"Add search paths for xml files for MediaProfiles\"" }, { "commit": "9ee3885b7da632d3c0320fbf38892b395d8fd8c7", "tree": "62a44b5a13b6375193846d0d486af54c34d5fd6e", "parents": [ "f8fbef69d5270db6f23cf5cca74e03a33475fd04", "c6930dfd3fad767686a64929b2f77b1124c6d840" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Wed May 10 04:13:59 2017 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed May 10 04:14:01 2017 +0000" }, "message": "Merge \"Update schema for media_profiles_V1_0.xml\"" }, { "commit": "defb1b0b7e082621a10763d1bd7a4a01e280fdf0", "tree": "4460bf2e95b801963d7222def3130a677b668333", "parents": [ "f7e2da4ca19db264d47c96ae07152aef6bce5c30" ], "author": { "name": "Mathias Agopian", "email": "mathias@google.com", "time": "Thu Apr 27 22:40:10 2017 -0700" }, "committer": { "name": "Mathias Agopian", "email": "mathias@google.com", "time": "Tue May 09 15:41:27 2017 -0700" }, "message": "fix circular dependency libnativewindow \u003c-\u003e libui\n\nBug: 37647680, 37648355\nTest: compile, manual\nChange-Id: I9cb8a1320d7c73299fb2b081a054eafb8ef086c8\n" }, { "commit": "7646a7daf89785fc501ca61d61e1bd7227206dd2", "tree": "1d9f41ee9d2e112aa9297f801a458b6a35f66c12", "parents": [ "eec84ca044df6390db0e5c9f40c263171fe022a7" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Thu Apr 20 17:30:33 2017 -0700" }, "committer": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Tue May 09 20:38:46 2017 +0000" }, "message": "Convert libstagefright to Android.bp\n\nSee build/soong/README.md for more information\n\nTest: builds\nChange-Id: I74cfc651d07cbbaddeae7c4da9da6f2527aee691\n(cherry picked from commit 6f82b4d3e970469de830d9fffcfcbea800e4637e)\n" }, { "commit": "c6930dfd3fad767686a64929b2f77b1124c6d840", "tree": "e1c8acdc0bdb5597c8b5d60345ee9e1e8ce6e75a", "parents": [ "c65e23d46301742f8e4f390dd7a5a66894337b82" ], "author": { "name": "Pawin Vongmasa", "email": "pawin@google.com", "time": "Mon May 08 17:06:22 2017 -0700" }, "committer": { "name": "Pawin Vongmasa", "email": "pawin@google.com", "time": "Mon May 08 20:42:12 2017 -0700" }, "message": "Update schema for media_profiles_V1_0.xml\n\nTest: Small CtsMediaTestCases\nTest: \"xmllint --valid ...\" now produces no error\n\nBug: 36430270\nChange-Id: I1270a9357d444047f463e3da25510ae69930a451\n" }, { "commit": "72ad8cb0aec92b818505a08765e44a56e9d2776a", "tree": "c83c37993ab6408c7e096a48c52362c4b43169e2", "parents": [ "c65e23d46301742f8e4f390dd7a5a66894337b82" ], "author": { "name": "Pawin Vongmasa", "email": "pawin@google.com", "time": "Wed May 03 04:19:20 2017 -0700" }, "committer": { "name": "Pawin Vongmasa", "email": "pawin@google.com", "time": "Mon May 08 18:57:32 2017 -0700" }, "message": "Add search paths for xml files for MediaProfiles\n\nThis CL also adds versions to xml files. The default name for\nthe xml file is changed from media_profiles.xml to\nmedia_profiles_V1_0.xml.\n\nTest: Small CtsMediaTestCases\nTest: Manual use of video recording and playback in Camera app\nBug: 36430270\nChange-Id: Idd0cd07f358fb4eda8ce5b31adf62a7313eccbbf\n" }, { "commit": "6f82b4d3e970469de830d9fffcfcbea800e4637e", "tree": "3bead112cc2f499eb354e8e82167278cbe9a6c96", "parents": [ "e9aa3a29f3338bf5a029ce5ff3280738b00be0f8" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Thu Apr 20 17:30:33 2017 -0700" }, "committer": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Mon May 08 14:17:38 2017 -0700" }, "message": "Convert libstagefright to Android.bp\n\nSee build/soong/README.md for more information\n\nTest: builds\nChange-Id: I74cfc651d07cbbaddeae7c4da9da6f2527aee691\n" }, { "commit": "f0f0826607a753bf2af9bd366c6dd7f169df2dc7", "tree": "d3d06f998924e45f358742cdedefcfb8f65e3a78", "parents": [ "cc49b266bb2a6dcc4249afe26f6374f48b753396" ], "author": { "name": "Pawin Vongmasa", "email": "pawin@google.com", "time": "Wed May 03 15:43:59 2017 -0700" }, "committer": { "name": "Pawin Vongmasa", "email": "pawin@google.com", "time": "Fri May 05 18:01:48 2017 -0700" }, "message": "Add media_profiles_V1_0.dtd\n\nmedia_profiles_V1_0.dtd is the schema file for media_profiles_V1_0.xml.\n\nTest: media_profiles_V1_0.dtd exists in system/etc\n\nBug: 36430270\nChange-Id: If456618dfa73274c8e5b998818139840a5258ea8\n" }, { "commit": "b6754549ba08bf282fc0731a49c8b6342b8cb301", "tree": "4683be00ed0dfb6df50f0d3171ff39d7e24b639c", "parents": [ "37636a9d63c5aad8f07a4846ed657f5f398ec0f1" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Thu Apr 20 12:48:51 2017 -0700" }, "committer": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Thu May 04 15:12:20 2017 +0000" }, "message": "Convert libmedia to Android.bp\n\nSee build/soong/README.md for more information.\n\nTest: m -j checkbuild\nChange-Id: I7326405e50dd847ba9528aee5e5cd79f204c44af\n(cherry picked from commit eeb436397a78aa80e41a4929a5f379319eefe0c3)\n" }, { "commit": "eeb436397a78aa80e41a4929a5f379319eefe0c3", "tree": "25f6dbf36c9e2468fb086767f7b8c2656e4d88da", "parents": [ "58901127cfd84cbcc11fadd1ca2d3b4b9b9cbcdd" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Thu Apr 20 12:48:51 2017 -0700" }, "committer": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Wed May 03 13:35:49 2017 -0700" }, "message": "Convert libmedia to Android.bp\n\nSee build/soong/README.md for more information.\n\nTest: m -j checkbuild\nChange-Id: I7326405e50dd847ba9528aee5e5cd79f204c44af\n" }, { "commit": "58901127cfd84cbcc11fadd1ca2d3b4b9b9cbcdd", "tree": "aa769c21fe1156f39806519ee67b2bed397744ca", "parents": [ "3243d43c0596c18845781607bae6ef8995ea624d", "e0ad778bfe63308a37f5b5745d92f0d7d165660a" ], "author": { "name": "Christopher Ferris", "email": "cferris@google.com", "time": "Wed May 03 18:07:06 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed May 03 18:07:06 2017 +0000" }, "message": "Merge \"Remove reference to libc_logging.\" am: 87428f1e82 am: 46b2135bfb am: ed566c401f\nam: e0ad778bfe\n\nChange-Id: Ie6cc701a3f8e9c6753378651443642c726f53fa9\n" }, { "commit": "e0ad778bfe63308a37f5b5745d92f0d7d165660a", "tree": "3319716b837ca02c13ffce53dcb2083216e0afb8", "parents": [ "c8df2c1881daaf3743abf3b3dfc7299c4918de63", "ed566c401ff959cd8a6ef15b7be12a47218e97df" ], "author": { "name": "Christopher Ferris", "email": "cferris@google.com", "time": "Wed May 03 18:01:31 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed May 03 18:01:31 2017 +0000" }, "message": "Merge \"Remove reference to libc_logging.\" am: 87428f1e82 am: 46b2135bfb\nam: ed566c401f\n\nChange-Id: Ia3390de121f6146e81c5bd61d9b8327e7d810a7c\n" }, { "commit": "87428f1e826e6ee5bb921e258152fd174d4d0631", "tree": "cd844e3292193978acad427f90f3cfc0830a2861", "parents": [ "87f0897426e3f428c6ebd5793787a9b4855a3a56", "5a00c54fac03ab2f3ee3eb79b2837832eeef3186" ], "author": { "name": "Christopher Ferris", "email": "cferris@google.com", "time": "Wed May 03 17:43:33 2017 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Wed May 03 17:43:35 2017 +0000" }, "message": "Merge \"Remove reference to libc_logging.\"" }, { "commit": "c8df2c1881daaf3743abf3b3dfc7299c4918de63", "tree": "083f8119140714395b100c8dcc24f6d73f9ffd82", "parents": [ "ca51723dce743d357cb2866d903d4162fb521a5d" ], "author": { "name": "Steven Moreland", "email": "smoreland@google.com", "time": "Tue May 02 17:06:16 2017 -0700" }, "committer": { "name": "Steven Moreland", "email": "smoreland@google.com", "time": "Wed May 03 03:04:22 2017 +0000" }, "message": "Remove redundant dependencies\n\nandroid.hidl.base@1.0 and android.hidl.manager@1.0 are built into libhidltransport.\n\nTest: links\nBug: 33276472\nChange-Id: I6ffb95645e767ab2575623333b12ba720f64d58b\n(cherry picked from commit 5e732cdddf1efd2f78f24b16463c17235103226e)\n" }, { "commit": "5e732cdddf1efd2f78f24b16463c17235103226e", "tree": "8e664d46fa710517fd3b06641b8437670ea8e1f2", "parents": [ "2dde082e9f58b6aa7fab29f929dc11101db02846" ], "author": { "name": "Steven Moreland", "email": "smoreland@google.com", "time": "Tue May 02 17:06:16 2017 -0700" }, "committer": { "name": "Steven Moreland", "email": "smoreland@google.com", "time": "Tue May 02 17:06:16 2017 -0700" }, "message": "Remove redundant dependencies\n\nandroid.hidl.base@1.0 and android.hidl.manager@1.0 are built into libhidltransport.\n\nTest: links\nBug: 33276472\nChange-Id: I6ffb95645e767ab2575623333b12ba720f64d58b\n" }, { "commit": "0bdcf66bf30dfe60b44ea2d69bc846cca33fc3f3", "tree": "b2cf28124cfdb348875ce7e0b173f71595d8ea85", "parents": [ "f6014a1ceee2e2c71f6603048eebc346a261e87a" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Thu Apr 27 16:15:51 2017 -0700" }, "committer": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Tue May 02 15:08:48 2017 -0700" }, "message": "Fix trivial warnings hidden by -isystem\n\nFix the trivial warnings that are hidden by the use of -isystem to\ninclude frameworks/av and caught by -Werror.\n\nTest: m -j checkbuild\nBug: 31751828\nChange-Id: I155f9f772ce0a84b364313814cb7cf528b9de4eb\nMerged-In: I155f9f772ce0a84b364313814cb7cf528b9de4eb\n(cherry picked from commit b8c35f94470d1518e2def0582aaec4e038c92af0)\n" }, { "commit": "4e399991097e4d7180ab1e276e15f546705aa6f3", "tree": "a0adfa530b793dce1d8f80f154f2243c7c4caac1", "parents": [ "1759bb5511fe1b6648e3da1b1e7ee98ca7aa2b1b" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Thu Apr 27 16:15:51 2017 -0700" }, "committer": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Tue May 02 14:51:13 2017 -0700" }, "message": "Fix trivial warnings hidden by -isystem\n\nFix the trivial warnings that are hidden by the use of -isystem to\ninclude frameworks/av and caught by -Werror.\n\nTest: m -j checkbuild\nBug: 31751828\nChange-Id: I155f9f772ce0a84b364313814cb7cf528b9de4eb\nMerged-In: I155f9f772ce0a84b364313814cb7cf528b9de4eb\n(cherry picked from commit b8c35f94470d1518e2def0582aaec4e038c92af0)\n" }, { "commit": "5a00c54fac03ab2f3ee3eb79b2837832eeef3186", "tree": "7211c75035bbb708876b62a0d38d8c5ebd02afcd", "parents": [ "afca9ca288c46038527ee28a34b9f2206132ba55" ], "author": { "name": "Christopher Ferris", "email": "cferris@google.com", "time": "Tue Apr 25 13:05:49 2017 -0700" }, "committer": { "name": "Christopher Ferris", "email": "cferris@google.com", "time": "Tue May 02 10:46:20 2017 -0700" }, "message": "Remove reference to libc_logging.\n\nThe libc_malloc_debug_backtrace includes the log functions so there\nis no need to also add the libc log library.\n\nTest: Built and booted a bullhead device.\nChange-Id: I00457ad0c321b385e68232ee87575588a8188db7\n" }, { "commit": "952a05feddbab2097e4dc4fb72438d51da198396", "tree": "8cb58369709691781257115f67a8c00550b36044", "parents": [ "86175456fb088c8cda6c3d6ee3f77254aa1318cd", "8aa96b78076a10f803329a49abcdc38204372f6f" ], "author": { "name": "Elliott Hughes", "email": "enh@google.com", "time": "Mon May 01 15:01:51 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Mon May 01 15:01:51 2017 +0000" }, "message": "Merge \"Remove unused #include.\" am: 66f70d2c8f am: ad06541333 am: dfb2379a16\nam: 8aa96b7807\n\nChange-Id: I3c04d3d225e9ebeca3ab6a9bf8a632e3ef2237b4\n" }, { "commit": "8aa96b78076a10f803329a49abcdc38204372f6f", "tree": "c97c94d2a5d6f4b8a59a1a14c479ff8112cf9e79", "parents": [ "dc57616ef1949898a92d2ef86433dd1918be7b8e", "dfb2379a1669a1a50d26fd67742593c1141cd723" ], "author": { "name": "Elliott Hughes", "email": "enh@google.com", "time": "Mon May 01 14:59:23 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Mon May 01 14:59:23 2017 +0000" }, "message": "Merge \"Remove unused #include.\" am: 66f70d2c8f am: ad06541333\nam: dfb2379a16\n\nChange-Id: Ic8190f5093c56e5f1b949b7e96aa75fba14e42ad\n" }, { "commit": "66f70d2c8f10a78a05604bd36e7b6f67cb5fb06b", "tree": "de94030900432daf9e446ff6246e5ba9a1e2848c", "parents": [ "6902463aa90c7cc27e4b236f6d3d58534f34c947", "aa4db8923757ec876c7cb8472cf3a937480d6189" ], "author": { "name": "Elliott Hughes", "email": "enh@google.com", "time": "Mon May 01 14:49:20 2017 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Mon May 01 14:49:21 2017 +0000" }, "message": "Merge \"Remove unused #include.\"" }, { "commit": "16e6a903e4360e541c21f4391b1d3ab19d687feb", "tree": "71f67c8eb588acb8c13ca401cb4c447ebde34cc1", "parents": [ "da8a81dc076ac4a4cddc6f3356b7f6ffbc760e7a", "b8c35f94470d1518e2def0582aaec4e038c92af0" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Sat Apr 29 20:17:40 2017 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Sat Apr 29 20:17:42 2017 +0000" }, "message": "Merge changes I155f9f77,Ibb1aa07a\n\n* changes:\n Fix trivial warnings hidden by -isystem\n Fix non-trivial warnings hidden by -isystem\n" }, { "commit": "aa4db8923757ec876c7cb8472cf3a937480d6189", "tree": "1999d8769bc46751c6e44812f699b37d61b479b7", "parents": [ "f99ffd986c98b9e888678f63202788c59a9867e8" ], "author": { "name": "Elliott Hughes", "email": "enh@google.com", "time": "Sat Apr 29 10:16:54 2017 -0700" }, "committer": { "name": "Elliott Hughes", "email": "enh@google.com", "time": "Sat Apr 29 12:39:18 2017 -0700" }, "message": "Remove unused #include.\n\nBug: N/A\nTest: builds\nChange-Id: Ia493566414e7d08ae12bb9ba754d5c207eed8d3e\n" }, { "commit": "b0bb2ec974c7382dca7179082c7db3c7486c6854", "tree": "ef18e7698796e8265d2acc12777aa57a2df7c58e", "parents": [ "2bedf7bba6f938c0e9cbabab9b299bdd00de8bcb" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Thu Apr 27 16:15:51 2017 -0700" }, "committer": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Fri Apr 28 23:59:34 2017 +0000" }, "message": "Fix warnings hidden by -isystem\n\nFix -Wundefined-var-template and -Wsign-compare warnings that were\nhidden by the use of -isystem to include frameworks/av.\n\nTest: m -j native\nBug: 31751828\nChange-Id: I28e07b238d5bc913ea2f3dfa09fa02f577d5a250\n(cherry picked from commit d995c0186ee0fc13f397a35808a1bc8045ab48d0)\n" }, { "commit": "68419cb5207e2d1974d72d9b875f7c78ccd02c6c", "tree": "884b58963d43753cce878807c6b9e461ec29033a", "parents": [ "1b1401549e5efbd56b046f0a0b23acf3f8d167ed", "2bedf7bba6f938c0e9cbabab9b299bdd00de8bcb" ], "author": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Fri Apr 28 23:42:44 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Apr 28 23:42:44 2017 +0000" }, "message": "Merge \"IMediaExtractor: ensure users to check returned value by getTrack.\" into oc-dev am: ea2cd13885\nam: 2bedf7bba6\n\nChange-Id: I2314fa95cd95d30ca06ee29ec9132dfcd0cc7da5\n" }, { "commit": "b8c35f94470d1518e2def0582aaec4e038c92af0", "tree": "0ef68bf31016198ef4a9f26d33025fa332c2abd4", "parents": [ "6f51c153ea5e4187a313e47ac8bad9a1a999d4e1" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Thu Apr 27 16:15:51 2017 -0700" }, "committer": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Fri Apr 28 16:41:36 2017 -0700" }, "message": "Fix trivial warnings hidden by -isystem\n\nFix the trivial warnings that are hidden by the use of -isystem to\ninclude frameworks/av and caught by -Werror.\n\nTest: m -j checkbuild\nBug: 31751828\nChange-Id: I155f9f772ce0a84b364313814cb7cf528b9de4eb\n" }, { "commit": "8dbc1205446e09f43a00b2d88c15d2cd93a0b998", "tree": "c29cf31d4b09f5b8c1ceef87ac0410e0eb87b337", "parents": [ "75d76012b684eaa56e90280f69b23fc2d8294636" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Thu Apr 27 12:33:20 2017 -0700" }, "committer": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Fri Apr 28 22:06:51 2017 +0000" }, "message": "LOCAL_CLANG :\u003d true is now the default\n\nTest: verify that build has no failures\nChange-Id: Ib249b276c6295e55eb54fa37b6d15486415dfbed\nMerged-In: Ib249b276c6295e55eb54fa37b6d15486415dfbed\n(cherry picked from commit 5f5ee1110dd85001b43db7637a97474acfe8d681)\n" }, { "commit": "83931fd7b4cd7a3917a8833f6c85e08fe1ace4a8", "tree": "8f7cde2b51f1cf97b895aa47f9332bddba9ae1a0", "parents": [ "94d15f9c0c7dc8a916ebfcf0f208adcc427df7f6" ], "author": { "name": "Wonsik Kim", "email": "wonsik@google.com", "time": "Fri Mar 04 18:22:15 2016 +0900" }, "committer": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Fri Apr 28 22:02:46 2017 +0000" }, "message": "stagefright: move MediaDefs from libstagefright to libmedia\n\nBug: 24761407\nChange-Id: If4914340a645c6f3c14eea0c873c162926d72ca2\n(cherry picked from commit ce4df5e534eb86748fe80c84efb6b7fc0b6b5b46)\n" }, { "commit": "322db26b76f7511c6d73f34a92a4e54840fcb876", "tree": "bd9b2b3017bfc330e84a5fb50f1eb6966dd116de", "parents": [ "02cccfd9e790ba8758aba2b4f2a600a7d8fd1566" ], "author": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Fri Apr 28 10:20:07 2017 -0700" }, "committer": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Fri Apr 28 11:12:23 2017 -0700" }, "message": "IMediaExtractor: ensure users to check returned value by getTrack.\n\nTest: fix the crash from the stream in the bug.\nBug: 37777357\nChange-Id: Ia99907c396a2074a9419db9b8103a9325b290169\n" }, { "commit": "34322935fc00fec67e689ff369fdce3d30039e82", "tree": "15952aa96f6360df347316f4838be89670cd7993", "parents": [ "4b22cbfefc33681870158cd2c6355d3a34dd6ad7", "ed56be2edfd2b7f18f8cd6ef5eba54738b53d95f" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Fri Apr 28 15:30:56 2017 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Apr 28 15:30:57 2017 +0000" }, "message": "Merge changes I90852003,Icfc13bb5,I28e07b23\n\n* changes:\n Convert libmediametrics to Android.bp\n Convert libmediadrm to Android.bp\n Fix warnings hidden by -isystem\n" }, { "commit": "d995c0186ee0fc13f397a35808a1bc8045ab48d0", "tree": "c7a9764f51eb295318dd37b7095b131ae05e3b7d", "parents": [ "fa382b7165edc0eba84975a0abaf159a70ea9d86" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Thu Apr 27 16:15:51 2017 -0700" }, "committer": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Thu Apr 27 16:25:30 2017 -0700" }, "message": "Fix warnings hidden by -isystem\n\nFix -Wundefined-var-template and -Wsign-compare warnings that were\nhidden by the use of -isystem to include frameworks/av.\n\nTest: m -j native\nBug: 31751828\nChange-Id: I28e07b238d5bc913ea2f3dfa09fa02f577d5a250\n" }, { "commit": "6330ce561e401ca5bc65a74a323de32fc5bad7ad", "tree": "5beff78b25ed99a60b187292681f59268bbe902a", "parents": [ "084ad5a4e0af7f816e3279359ed49ae18f8c7d74" ], "author": { "name": "Yi Kong", "email": "yikong@google.com", "time": "Thu Apr 27 15:22:03 2017 -0700" }, "committer": { "name": "Yi Kong", "email": "yikong@google.com", "time": "Thu Apr 27 15:22:03 2017 -0700" }, "message": "Remove unused lambda capture\n\nClean up, no functionality change.\n\nTest: build\nBug: 37752547\nChange-Id: I040b5af2069b679a8a7e681cb79b24664224fc5b\n" }, { "commit": "bd20f6bcd7fb1a906ded32eaa2989447b47fd421", "tree": "2abac0395613aab4b27e8eb533143994827bc15e", "parents": [ "f99ffd986c98b9e888678f63202788c59a9867e8" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Mon Nov 07 16:34:52 2016 -0800" }, "committer": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Mon Apr 24 23:40:15 2017 +0000" }, "message": "Clean up mediadrm dependencies\n\nMove various things around so mediadrmserver doesn\u0027t need\nlibstagefright and libmedia\n\nTest: build/boot\nChange-Id: I48b713cd679b992cb6ad1262c20394a9892d7027\nMerged-In: I48b713cd679b992cb6ad1262c20394a9892d7027\n(cherry picked from commit 75571e4bc76bd2defd4309c7154120840396329d)\n" }, { "commit": "f72cefddf378909f360998852e41f49042711299", "tree": "88eec98dcb8b77b8fe27c52acd4ff0b7f7c969c8", "parents": [ "cbe1bfea6415902af50a138df1a227f6b49afafc" ], "author": { "name": "Hangyu Kuang", "email": "hkuang@google.com", "time": "Wed Apr 05 11:07:08 2017 -0700" }, "committer": { "name": "Hangyu Kuang", "email": "hkuang@google.com", "time": "Fri Apr 21 17:09:05 2017 -0700" }, "message": "media: Support getStopTimeOffsetUs in GraphicBufferSource.\n\nSo MediaCodecSource could use the stopTimeOffset to adjust the stop timeout\ndynamically.\n\nTest: Camera recording with video stream delay.\nBug: 35925528\nChange-Id: Ic186971992bdc03155e9993cb44027002f71a457\n" }, { "commit": "22dc508717c7767927064ec7c152def99e54adcb", "tree": "7590c5e895632e3a7e8bf20f7a09299f6a1b8dca", "parents": [ "24059088a46160f731903cc66404184a531d0478" ], "author": { "name": "Pawin Vongmasa", "email": "pawin@google.com", "time": "Thu Apr 20 05:12:55 2017 -0700" }, "committer": { "name": "Pawin Vongmasa", "email": "pawin@google.com", "time": "Thu Apr 20 18:35:08 2017 -0700" }, "message": "Make IGraphicBufferSource::setTimeLapseConfig take fps\n\nTest: Manual use of Camera, Movies, Photos and YouTube apps.\n\nTest: With CtsMediaTestCases.apk installed,\nadb shell am instrument -e size small -w\n\u0027android.media.cts/android.support.test.runner.AndroidJUnitRunner\u0027\n\nBug: 37302530\nChange-Id: Id0d4f7fed57349a2f5484f6b6264981471e8f022\n" }, { "commit": "fc59a24fa7d272be1e09a4b5d31bc89b3d16aeaa", "tree": "712865ce75e6f34b58f2427364fa0e6cb75f2829", "parents": [ "ad2024079f4abd65aa3da27e6ba07f50772e03cf", "88454e41f034404d0745fded18b5a3a736135369" ], "author": { "name": "Andy Hung", "email": "hunga@google.com", "time": "Wed Apr 19 20:34:11 2017 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Apr 19 20:34:12 2017 +0000" }, "message": "Merge \"Reduce memory usage by some extractors.\" into oc-dev" }, { "commit": "88454e41f034404d0745fded18b5a3a736135369", "tree": "8c07269c15a032359247ed105a59286a32029569", "parents": [ "67fbe2dac5a59d95f8527f8a0372ff5d9e2e4f9e" ], "author": { "name": "yuedl1", "email": "yuedl1@lenovo.com", "time": "Mon Mar 13 18:07:26 2017 +0800" }, "committer": { "name": "Andy Hung", "email": "hunga@google.com", "time": "Tue Apr 18 14:36:06 2017 -0700" }, "message": "Reduce memory usage by some extractors.\n\nOccurs for some extractors that use shared memory without MediaBufferObserver.\nCheck with high resolution MKV.\n\nPlay a mkv file continuously and check file descriptor count.\nadb shell lsof | grep mediae | wc\nadb shell lsof | grep medias | wc\n\nTest: Photos with mkv.\nBug: 36359517\nChange-Id: I8719b628406a838ee091499347b219a8a4736a25\nSigned-off-by: yuedl1 \u003cyuedl1@lenovo.com\u003e\n" } ], "next": "005f9e289f2db7fb2ce9a8a807d5a716917a722d" }