)]}' { "log": [ { "commit": "53f1ece56c663e9c29364b1dfe8d5c3d7bbe5ed5", "tree": "90c6ca815a666992d35ea4ce5c7dbf5815dfb5e0", "parents": [ "a0ec467ed342e81bb6775bb437646ca8ef204e17", "f1307ef28376cb2a7aefa1bfa7f9f66e22284f6c" ], "author": { "name": "Robert Shih", "email": "robertshih@google.com", "time": "Mon Jun 29 17:24:31 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Jun 29 17:24:31 2020 +0000" }, "message": "[automerger skipped] Merge \"clearkey hidl: fix oob read in decrypt\" into pi-dev am: f1307ef283 -s ours\n\nam skip reason: Change-Id I27b05479202e0caedfd052c683aa1ef187f65679 with SHA-1 9adaa6b87f is in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/11325608\n\nChange-Id: I0d08aa9431d985b68bf4a2a5a9b1a0a88782008f\n" }, { "commit": "f1307ef28376cb2a7aefa1bfa7f9f66e22284f6c", "tree": "158eaeb292b5928d279cf007977db161da2b9654", "parents": [ "b6b78798a47a74d511b9bcd6543b71cb675730bd", "fa3781fe0fb654659634d7b4703b6ed2ae27fdeb" ], "author": { "name": "Robert Shih", "email": "robertshih@google.com", "time": "Mon Jun 29 17:05:26 2020 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Jun 29 17:05:26 2020 +0000" }, "message": "Merge \"clearkey hidl: fix oob read in decrypt\" into pi-dev" }, { "commit": "a0ec467ed342e81bb6775bb437646ca8ef204e17", "tree": "90c6ca815a666992d35ea4ce5c7dbf5815dfb5e0", "parents": [ "7771132ca8e04c189950def84803240d549673e5", "9adaa6b87f4834bc8fc5ead43466cf4d6099b871" ], "author": { "name": "Robert Shih", "email": "robertshih@google.com", "time": "Sun Jun 28 03:26:06 2020 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Sun Jun 28 03:26:06 2020 +0000" }, "message": "Merge \"clearkey hidl: fix oob read in decrypt\" into qt-dev" }, { "commit": "7771132ca8e04c189950def84803240d549673e5", "tree": "61c1273db8c8ddff3ec7e4f50948a680d97778c2", "parents": [ "1d5ae3dd0faee158ae9a7bd6cd248237b3ea00a3", "b6b78798a47a74d511b9bcd6543b71cb675730bd" ], "author": { "name": "Ray Essick", "email": "essick@google.com", "time": "Tue Jun 02 18:21:45 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Jun 02 18:21:45 2020 +0000" }, "message": "Merge \"Fix potential use-after-free issue\" into oc-dev am: cb06eeab99 am: f543f7ffc1 am: abc29d848e am: b6b78798a4\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/11566487\n\nChange-Id: I6bad4e5adfeba9baa9d6756f46f5867394c4a3c6\n" }, { "commit": "b6b78798a47a74d511b9bcd6543b71cb675730bd", "tree": "2ad564ccd79a8b3ef9340381f03ff35694501b2a", "parents": [ "284841d9e38958afca6f95f5bdbcdfb960a4dfa7", "abc29d848e19449f55bb4a19226ef9594f3d030c" ], "author": { "name": "Ray Essick", "email": "essick@google.com", "time": "Tue Jun 02 18:06:50 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Jun 02 18:06:50 2020 +0000" }, "message": "Merge \"Fix potential use-after-free issue\" into oc-dev am: cb06eeab99 am: f543f7ffc1 am: abc29d848e\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/11566487\n\nChange-Id: Ic3e618a12eaac79e04857483ccb1cef606072079\n" }, { "commit": "abc29d848e19449f55bb4a19226ef9594f3d030c", "tree": "294a6fcb8a58f5a9584f0d5fc0220858a512ecff", "parents": [ "b7b552e563f0a192b343d5fcf3b5f8dff1d8c6a0", "f543f7ffc1f9db22d7bb0c29315d21004adb4330" ], "author": { "name": "Ray Essick", "email": "essick@google.com", "time": "Tue Jun 02 17:51:37 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Jun 02 17:51:37 2020 +0000" }, "message": "Merge \"Fix potential use-after-free issue\" into oc-dev am: cb06eeab99 am: f543f7ffc1\n\nOriginal change: undetermined\n\nChange-Id: Ie073af9204def3cc7bfbc9b9435cd65df443428f\n" }, { "commit": "f543f7ffc1f9db22d7bb0c29315d21004adb4330", "tree": "1387f426aa812345359c7f3321717faa35d1e728", "parents": [ "e8f92b71839096baf8ba9e5b3709cf83b59b035f", "cb06eeab99dad7de64b3d6e26567c5ed825d9fa8" ], "author": { "name": "Ray Essick", "email": "essick@google.com", "time": "Tue Jun 02 17:34:24 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Jun 02 17:34:24 2020 +0000" }, "message": "Merge \"Fix potential use-after-free issue\" into oc-dev am: cb06eeab99\n\nOriginal change: undetermined\n\nChange-Id: I9a2704421608984faa8d610af219b47dfc6dd1ae\n" }, { "commit": "cb06eeab99dad7de64b3d6e26567c5ed825d9fa8", "tree": "8be381e9fb1f6ba036774d52bfbff5d7f4a9ea32", "parents": [ "12ce8a9cd48b3fbb92b56b3e94b44c5bd47e2a24", "6aaef5a99f15da847a8c55a137bfc6263829e8ff" ], "author": { "name": "Ray Essick", "email": "essick@google.com", "time": "Tue Jun 02 17:17:30 2020 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Jun 02 17:17:30 2020 +0000" }, "message": "Merge \"Fix potential use-after-free issue\" into oc-dev" }, { "commit": "1d5ae3dd0faee158ae9a7bd6cd248237b3ea00a3", "tree": "325c0c48506962642aaca10bdd38919091c9342e", "parents": [ "6bd783737bf9b8fd66b69ad73c4edd63eb25f175", "284841d9e38958afca6f95f5bdbcdfb960a4dfa7" ], "author": { "name": "Ray Essick", "email": "essick@google.com", "time": "Tue Jun 02 16:46:21 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Jun 02 16:46:21 2020 +0000" }, "message": "[automerger skipped] Expand nuplayer mutex for mediametrics management am: 12ce8a9cd4 am: e8f92b7183 -s ours am: b7b552e563 -s ours am: 284841d9e3 -s ours\n\nam skip reason: Change-Id Ia2e68ef616e249a6e8746b9068f22bd208a0ffc8 with SHA-1 e5767553f5 is in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/11373388\n\nChange-Id: Ifdeafbb85c06715b254c42d71dfaa87a28621882\n" }, { "commit": "284841d9e38958afca6f95f5bdbcdfb960a4dfa7", "tree": "66e2b767b91c619fc3c7f7bbff1759cb246b4f88", "parents": [ "d95af0cdc115d306d127bd296454f3f213fe3c8f", "b7b552e563f0a192b343d5fcf3b5f8dff1d8c6a0" ], "author": { "name": "Ray Essick", "email": "essick@google.com", "time": "Tue Jun 02 16:34:56 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Jun 02 16:34:56 2020 +0000" }, "message": "[automerger skipped] Expand nuplayer mutex for mediametrics management am: 12ce8a9cd4 am: e8f92b7183 -s ours am: b7b552e563 -s ours\n\nam skip reason: Change-Id I1e9bbcd67a1510f70fad66e8ef77f529008e248a with SHA-1 86b46a20b2 is in history\n\nOriginal change: undetermined\n\nChange-Id: I40948fb4fc108dbb5d9ec327bc50c449d1ae548b\n" }, { "commit": "b7b552e563f0a192b343d5fcf3b5f8dff1d8c6a0", "tree": "a15fd14cb22f5d1342656ff8d594f04da6535d70", "parents": [ "8220d3f72c42befa948737ae4bd6b3fcc5fb2927", "e8f92b71839096baf8ba9e5b3709cf83b59b035f" ], "author": { "name": "Ray Essick", "email": "essick@google.com", "time": "Tue Jun 02 16:22:22 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Jun 02 16:22:22 2020 +0000" }, "message": "[automerger skipped] Expand nuplayer mutex for mediametrics management am: 12ce8a9cd4 am: e8f92b7183 -s ours\n\nam skip reason: Change-Id I9c473e47e7eb8dce24399bcb24f82a3d2d583983 with SHA-1 8220d3f72c is in history\n\nOriginal change: undetermined\n\nChange-Id: I902bd921471f32a9098bc3db065673be6f1e7769\n" }, { "commit": "e8f92b71839096baf8ba9e5b3709cf83b59b035f", "tree": "1967092d16164f9a7a2429dcc2115094c882a76b", "parents": [ "54c13ace7b02bbf74af87e608f09c07fa98d9c86", "12ce8a9cd48b3fbb92b56b3e94b44c5bd47e2a24" ], "author": { "name": "Ray Essick", "email": "essick@google.com", "time": "Tue Jun 02 16:10:21 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Jun 02 16:10:21 2020 +0000" }, "message": "Expand nuplayer mutex for mediametrics management am: 12ce8a9cd4\n\nOriginal change: undetermined\n\nChange-Id: I745cdf75d93a5025b677a703a030dec93a9957c4\n" }, { "commit": "6bd783737bf9b8fd66b69ad73c4edd63eb25f175", "tree": "325c0c48506962642aaca10bdd38919091c9342e", "parents": [ "568580a2fddc787728503298665dea55a5557a6c", "d95af0cdc115d306d127bd296454f3f213fe3c8f" ], "author": { "name": "Ray Essick", "email": "essick@google.com", "time": "Tue Jun 02 14:17:29 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Jun 02 14:17:29 2020 +0000" }, "message": "[automerger skipped] Expand nuplayer mutex for mediametrics management am: 8220d3f72c -s ours am: d95af0cdc1 -s ours\n\nam skip reason: Change-Id Ia2e68ef616e249a6e8746b9068f22bd208a0ffc8 with SHA-1 e5767553f5 is in history\n\nOriginal change: undetermined\n\nChange-Id: Ie7dd19a5497a794076f3faf0429dddad3c37a01d\n" }, { "commit": "d95af0cdc115d306d127bd296454f3f213fe3c8f", "tree": "66e2b767b91c619fc3c7f7bbff1759cb246b4f88", "parents": [ "86b46a20b2730790759aefcfa4c5d0cb3589c61b", "8220d3f72c42befa948737ae4bd6b3fcc5fb2927" ], "author": { "name": "Ray Essick", "email": "essick@google.com", "time": "Tue Jun 02 13:49:55 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Jun 02 13:49:55 2020 +0000" }, "message": "[automerger skipped] Expand nuplayer mutex for mediametrics management am: 8220d3f72c -s ours\n\nam skip reason: Change-Id I1e9bbcd67a1510f70fad66e8ef77f529008e248a with SHA-1 86b46a20b2 is in history\n\nOriginal change: undetermined\n\nChange-Id: I335133ca5ee6e41761c7732046b0469ecd3ad005\n" }, { "commit": "568580a2fddc787728503298665dea55a5557a6c", "tree": "325c0c48506962642aaca10bdd38919091c9342e", "parents": [ "f9f5f3806fdf79aeed0893303d10a5fe06c661df", "86b46a20b2730790759aefcfa4c5d0cb3589c61b" ], "author": { "name": "Ray Essick", "email": "essick@google.com", "time": "Tue Jun 02 04:45:16 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Jun 02 04:45:16 2020 +0000" }, "message": "[automerger skipped] Expand nuplayer mutex for mediametrics management am: 86b46a20b2 -s ours\n\nam skip reason: Change-Id Ia2e68ef616e249a6e8746b9068f22bd208a0ffc8 with SHA-1 e5767553f5 is in history\n\nOriginal change: undetermined\n\nChange-Id: Id177d437f7c92146c26da5df78ea95fb4c6fa374\n" }, { "commit": "f9f5f3806fdf79aeed0893303d10a5fe06c661df", "tree": "325c0c48506962642aaca10bdd38919091c9342e", "parents": [ "c6aa4cdcc9a55c9f335f86fb28427664faf76c1c", "e5767553f55fb30d9d58ba211ec68e64a6266e52" ], "author": { "name": "Ray Essick", "email": "essick@google.com", "time": "Tue Jun 02 04:20:35 2020 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Jun 02 04:20:35 2020 +0000" }, "message": "Merge \"Expand nuplayer mutex for mediametrics management\" into qt-dev" }, { "commit": "6aaef5a99f15da847a8c55a137bfc6263829e8ff", "tree": "1d011c423b846708e21638d35048a2ddf788f282", "parents": [ "5d8def9a0235d97fd6dfd88fb8b6b25bf98411c5" ], "author": { "name": "Andrew Lewis", "email": "andrewlewis@google.com", "time": "Wed May 20 16:49:23 2020 +0100" }, "committer": { "name": "Ray Essick", "email": "essick@google.com", "time": "Thu May 21 04:15:01 2020 +0000" }, "message": "Fix potential use-after-free issue\n\nNuPlayerListener passed this out of its constructor to\nIStreamSource-\u003esetListener, and it would get wrapped in a smart pointer,\nthen free\u0027d when that method returned.\n\nMove the setListener call after instantiation of NuPlayerListener to\navoid passing this out of the NuPlayerListener constructor.\n\nTest: tested in presubmit\nBug: 151456667\nChange-Id: I996d9ad9eaf0e52992b7f9e10fd94a94c350ad73\n(cherry picked from commit aad519df7fe3b69c8247669ea77ce339a44e8c51)\n" }, { "commit": "8220d3f72c42befa948737ae4bd6b3fcc5fb2927", "tree": "a15fd14cb22f5d1342656ff8d594f04da6535d70", "parents": [ "acb7a353006f74ba9cdda607b3fb8a87f9faa832" ], "author": { "name": "Ray Essick", "email": "essick@google.com", "time": "Mon May 18 11:14:33 2020 -0700" }, "committer": { "name": "Ray Essick", "email": "essick@google.com", "time": "Mon May 18 13:59:38 2020 -0700" }, "message": "Expand nuplayer mutex for mediametrics management\n\nrefactor some mutex for how nuplayer sets up mediametrics data.\nexpanded locking to eliminate a couple race conditions.\n\nBug: 151644303\nBug: 151643722\nTest: poc attached to bugs\nMerged-In: I75f29a6254c5eab5d4f524ee7a7ef59f93a0b405\nMerged-In: Ia2e68ef616e249a6e8746b9068f22bd208a0ffc8\nMerged-In: I1e9bbcd67a1510f70fad66e8ef77f529008e248a\nChange-Id: I9c473e47e7eb8dce24399bcb24f82a3d2d583983\n" }, { "commit": "12ce8a9cd48b3fbb92b56b3e94b44c5bd47e2a24", "tree": "ff8ced4d899deae39f76b2222e1acf87fb6d1a06", "parents": [ "5d8def9a0235d97fd6dfd88fb8b6b25bf98411c5" ], "author": { "name": "Ray Essick", "email": "essick@google.com", "time": "Mon May 04 16:24:56 2020 -0700" }, "committer": { "name": "Ray Essick", "email": "essick@google.com", "time": "Mon May 18 13:58:40 2020 -0700" }, "message": "Expand nuplayer mutex for mediametrics management\n\nrefactor some mutex for how nuplayer sets up mediametrics data.\nexpanded locking to eliminate a couple race conditions.\n\nBug: 151644303\nBug: 151643722\nTest: poc attached to bugs\nMerged-In: I75f29a6254c5eab5d4f524ee7a7ef59f93a0b405\nMerged-In: Ia2e68ef616e249a6e8746b9068f22bd208a0ffc8\nMerged-In: I1e9bbcd67a1510f70fad66e8ef77f529008e248a\nMerged-In: I9c473e47e7eb8dce24399bcb24f82a3d2d583983\nChange-Id: If9aeff27e14370bd8104acab1d2b0058d82874fd\n" }, { "commit": "86b46a20b2730790759aefcfa4c5d0cb3589c61b", "tree": "66e2b767b91c619fc3c7f7bbff1759cb246b4f88", "parents": [ "07ff5a7e50cb6595a6d3a7201e8157d0e9eabe0e" ], "author": { "name": "Ray Essick", "email": "essick@google.com", "time": "Mon May 04 16:23:41 2020 -0700" }, "committer": { "name": "Ray Essick", "email": "essick@google.com", "time": "Sat May 09 12:39:43 2020 -0700" }, "message": "Expand nuplayer mutex for mediametrics management\n\nrefactor some mutex for how nuplayer sets up mediametrics data.\nexpanded locking to eliminate a couple race conditions.\n\nBug: 151644303\nBug: 151643722\nTest: poc attached to bugs\nMerged-In: I75f29a6254c5eab5d4f524ee7a7ef59f93a0b405\nMerged-In: Ia2e68ef616e249a6e8746b9068f22bd208a0ffc8\nChange-Id: I1e9bbcd67a1510f70fad66e8ef77f529008e248a\n" }, { "commit": "e5767553f55fb30d9d58ba211ec68e64a6266e52", "tree": "b9d7f5ca880a78680207c6d21745b764ab65cf69", "parents": [ "886419a51c28003ad27ff89a9fcd0a4b3230df81" ], "author": { "name": "Ray Essick", "email": "essick@google.com", "time": "Mon May 04 16:22:15 2020 -0700" }, "committer": { "name": "Ray Essick", "email": "essick@google.com", "time": "Sat May 09 12:27:11 2020 -0700" }, "message": "Expand nuplayer mutex for mediametrics management\n\nrefactor some mutex for how nuplayer sets up mediametrics data.\nexpanded locking to eliminate a couple race conditions.\n\nBug: 151644303\nBug: 151643722\nTest: poc attached to bugs\nMerged-In: I75f29a6254c5eab5d4f524ee7a7ef59f93a0b405\nChange-Id: Ia2e68ef616e249a6e8746b9068f22bd208a0ffc8\n" }, { "commit": "fa3781fe0fb654659634d7b4703b6ed2ae27fdeb", "tree": "d50182551c44e77f1cc33c2cc0052f072be34388", "parents": [ "1859a38c4d8f438eba9cb7b39be102747407fa36" ], "author": { "name": "Robert Shih", "email": "robertshih@google.com", "time": "Fri May 01 15:16:20 2020 -0700" }, "committer": { "name": "Robert Shih", "email": "robertshih@google.com", "time": "Thu May 07 18:46:03 2020 +0000" }, "message": "clearkey hidl: fix oob read in decrypt\n\nValidate sum of subsample sizes do not overrun source buffer.\n\nBug: 154123412\nTest: poc_CryptoPlugin_cpp_183\nTest: MediaDrmClearkeyTest\nTest: NativeMediaDrmClearkeyTest\nChange-Id: I27b05479202e0caedfd052c683aa1ef187f65679\nMerged-In: I27b05479202e0caedfd052c683aa1ef187f65679\n" }, { "commit": "9adaa6b87f4834bc8fc5ead43466cf4d6099b871", "tree": "7a781d2fbab9261a041a7a47bc207b7b7bd5c6bc", "parents": [ "2c97e3371f0d33cf7805c48c4b89534841afc781" ], "author": { "name": "Robert Shih", "email": "robertshih@google.com", "time": "Fri May 01 15:16:20 2020 -0700" }, "committer": { "name": "Robert Shih", "email": "robertshih@google.com", "time": "Thu May 07 18:45:34 2020 +0000" }, "message": "clearkey hidl: fix oob read in decrypt\n\nValidate sum of subsample sizes do not overrun source buffer.\n\nBug: 154123412\nTest: poc_CryptoPlugin_cpp_183\nTest: MediaDrmClearkeyTest\nTest: NativeMediaDrmClearkeyTest\nChange-Id: I27b05479202e0caedfd052c683aa1ef187f65679\n" }, { "commit": "c6aa4cdcc9a55c9f335f86fb28427664faf76c1c", "tree": "2652e51f3330648ce0d770495bcbaebe9ab7a957", "parents": [ "2c97e3371f0d33cf7805c48c4b89534841afc781", "07ff5a7e50cb6595a6d3a7201e8157d0e9eabe0e" ], "author": { "name": "Harish Mahendrakar", "email": "harish.mahendrakar@ittiam.com", "time": "Sat May 02 00:27:40 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Sat May 02 00:27:40 2020 +0000" }, "message": "m4v_h263: Return error for zero width and height am: 5d8def9a02 am: 54c13ace7b am: acb7a35300 am: 07ff5a7e50\n\nChange-Id: I8d2ec7abb94a81b9e13a432302e55b7318a51f13\n" }, { "commit": "07ff5a7e50cb6595a6d3a7201e8157d0e9eabe0e", "tree": "5beaa0fe9f1ce615b5c539f62676d6605b8b9192", "parents": [ "1859a38c4d8f438eba9cb7b39be102747407fa36", "acb7a353006f74ba9cdda607b3fb8a87f9faa832" ], "author": { "name": "Harish Mahendrakar", "email": "harish.mahendrakar@ittiam.com", "time": "Sat May 02 00:09:25 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Sat May 02 00:09:25 2020 +0000" }, "message": "m4v_h263: Return error for zero width and height am: 5d8def9a02 am: 54c13ace7b am: acb7a35300\n\nChange-Id: I47133dc8f9650a75ce135e8df02b5aee713942d9\n" }, { "commit": "acb7a353006f74ba9cdda607b3fb8a87f9faa832", "tree": "cf1e88f66dffd8b04edd5d23f586cfc47d6223ee", "parents": [ "245e44d9cfe008fcc460126f8992abf6c299a45c", "54c13ace7b02bbf74af87e608f09c07fa98d9c86" ], "author": { "name": "Harish Mahendrakar", "email": "harish.mahendrakar@ittiam.com", "time": "Fri May 01 23:58:36 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri May 01 23:58:36 2020 +0000" }, "message": "m4v_h263: Return error for zero width and height am: 5d8def9a02 am: 54c13ace7b\n\nChange-Id: I1838c90cbc4ae1bd719a0ab72fe39d6ad7315322\n" }, { "commit": "54c13ace7b02bbf74af87e608f09c07fa98d9c86", "tree": "d39b9e060c6118e3c1dd625aef6a99640f2c3886", "parents": [ "a9296786e36577a05de3f3500db0cdb2fabf13c0", "5d8def9a0235d97fd6dfd88fb8b6b25bf98411c5" ], "author": { "name": "Harish Mahendrakar", "email": "harish.mahendrakar@ittiam.com", "time": "Fri May 01 23:42:17 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri May 01 23:42:17 2020 +0000" }, "message": "m4v_h263: Return error for zero width and height am: 5d8def9a02\n\nChange-Id: Icebe5dec879863b63f2feaf53da1f66211278633\n" }, { "commit": "5d8def9a0235d97fd6dfd88fb8b6b25bf98411c5", "tree": "019da8ecb1dc0f643cc5606194399ad7850b86d3", "parents": [ "4bbfb6d8815002fc79b26aebba5f3ad2226c468e" ], "author": { "name": "Harish Mahendrakar", "email": "harish.mahendrakar@ittiam.com", "time": "Fri Apr 10 04:31:59 2020 +0530" }, "committer": { "name": "Ray Essick", "email": "essick@google.com", "time": "Fri Apr 10 21:24:18 2020 -0700" }, "message": "m4v_h263: Return error for zero width and height\n\nTest: poc in bug\nBug: 152496149\nBug: 152629190\n\nChange-Id: I07293e97b664e03e29a1392b139132fc137361cd\n" }, { "commit": "2c97e3371f0d33cf7805c48c4b89534841afc781", "tree": "610cead8b9bf1ff5114cbd6405e3f7246fd356ea", "parents": [ "00c275670b12bb1c610a998bbc4f3db204464f45", "1859a38c4d8f438eba9cb7b39be102747407fa36" ], "author": { "name": "Yin-Chia Yeh", "email": "yinchiayeh@google.com", "time": "Mon Apr 06 21:13:52 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Apr 06 21:13:52 2020 +0000" }, "message": "[automerger skipped] RESTRICT AUTOMERGE: Camera: fix use after free in sensor timestamp am: 1859a38c4d -s ours\n\nam skip reason: subject contains skip directive\n\nChange-Id: I5f37c2d4a6ec2854b6a2e5337c2a009817983e4d\n" }, { "commit": "00c275670b12bb1c610a998bbc4f3db204464f45", "tree": "610cead8b9bf1ff5114cbd6405e3f7246fd356ea", "parents": [ "886419a51c28003ad27ff89a9fcd0a4b3230df81" ], "author": { "name": "Yin-Chia Yeh", "email": "yinchiayeh@google.com", "time": "Mon Mar 16 11:35:25 2020 -0700" }, "committer": { "name": "Yin-Chia Yeh", "email": "yinchiayeh@google.com", "time": "Tue Mar 17 16:28:18 2020 +0000" }, "message": "RESTRICT AUTOMERGE: Camera: fix use after free in sensor timestamp\n\nThe metadata object might be overriden later and has it memory\nre-allocated; hence snaping the sensor timestamp value before\nwe call into any method that might change the metadata.\n\nTest: build\nBug: 150944913\nMerged-In: I0f944fc9133d3ab279859f20236d956d7ca338f8\nChange-Id: I5b10b680e0cce96ca49e1772770adb4835545472\n" }, { "commit": "1859a38c4d8f438eba9cb7b39be102747407fa36", "tree": "77bb3e9a4cf6ae959be86aa89573f81ef69421b1", "parents": [ "d8d4e803842bed4188606856858189054a89c95c" ], "author": { "name": "Yin-Chia Yeh", "email": "yinchiayeh@google.com", "time": "Mon Mar 16 11:49:30 2020 -0700" }, "committer": { "name": "Yin-Chia Yeh", "email": "yinchiayeh@google.com", "time": "Tue Mar 17 16:27:26 2020 +0000" }, "message": "RESTRICT AUTOMERGE: Camera: fix use after free in sensor timestamp\n\nThe metadata object might be overriden later and has it memory\nre-allocated; hence snaping the sensor timestamp value before\nwe call into any method that might change the metadata.\n\nTest: build\nBug: 150944913\nMerged-In: I5b10b680e0cce96ca49e1772770adb4835545472\nChange-Id: I5b10b680e0cce96ca49e1772770adb4835545472\n" }, { "commit": "886419a51c28003ad27ff89a9fcd0a4b3230df81", "tree": "88b5781497959c2bdaa627c9764ac1ce05e4c5f0", "parents": [ "f3f966faa6f46156726a338208f6c10a97d3fb4b", "d8d4e803842bed4188606856858189054a89c95c" ], "author": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Mar 11 20:40:49 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Mar 11 20:40:49 2020 +0000" }, "message": "BnCrypto: fix use-before-init in CREATE_PLUGIN am: 4bbfb6d881 am: a9296786e3 am: 245e44d9cf am: d8d4e80384\n\nChange-Id: I61799ad95db7c74c031f633a6ec19c27f491bd4b\n" }, { "commit": "d8d4e803842bed4188606856858189054a89c95c", "tree": "07cbd892a9032ee2899f69abeaf200d0eb447d24", "parents": [ "509f1a5030ec005db387a4f0420af12e03d1b7f8", "245e44d9cfe008fcc460126f8992abf6c299a45c" ], "author": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Mar 11 20:29:38 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Mar 11 20:29:38 2020 +0000" }, "message": "BnCrypto: fix use-before-init in CREATE_PLUGIN am: 4bbfb6d881 am: a9296786e3 am: 245e44d9cf\n\nChange-Id: I480db45b78b567a832d591df0834dbdae6cf88d0\n" }, { "commit": "245e44d9cfe008fcc460126f8992abf6c299a45c", "tree": "5aabfd0bcd9276de0d1c5f30373f8c4da27c6af9", "parents": [ "8d2c3d65d06bdf21a8fa4715352cb2a12a442579", "a9296786e36577a05de3f3500db0cdb2fabf13c0" ], "author": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Mar 11 20:17:01 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Mar 11 20:17:01 2020 +0000" }, "message": "BnCrypto: fix use-before-init in CREATE_PLUGIN am: 4bbfb6d881 am: a9296786e3\n\nChange-Id: I6518f72aab3fdfd0ec2e455708f3177a4966514e\n" }, { "commit": "a9296786e36577a05de3f3500db0cdb2fabf13c0", "tree": "667e5e739b038a789797ace35b68120e238e1110", "parents": [ "911b808a6568fee9c2fd1aa89039161195873350", "4bbfb6d8815002fc79b26aebba5f3ad2226c468e" ], "author": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Mar 11 20:05:08 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Mar 11 20:05:08 2020 +0000" }, "message": "BnCrypto: fix use-before-init in CREATE_PLUGIN am: 4bbfb6d881\n\nChange-Id: I943db03ec26b3a7ec24636df46e2a21a472d52d2\n" }, { "commit": "4bbfb6d8815002fc79b26aebba5f3ad2226c468e", "tree": "958f89fe190c6ef2d9ddc3cc5fec4d6f0d28389f", "parents": [ "58af3de44d17e6ba716178e147474a20765c1441" ], "author": { "name": "Robert Shih", "email": "robertshih@google.com", "time": "Tue Feb 04 17:23:58 2020 -0800" }, "committer": { "name": "Robert Shih", "email": "robertshih@google.com", "time": "Tue Mar 10 13:29:13 2020 -0700" }, "message": "BnCrypto: fix use-before-init in CREATE_PLUGIN\n\nBug: 144767096\nTest: poc_ICrypto_283\nMerged-In: Id67dc9e793ee886e4cc49370d800c7f3580df313\nMerged-In: I81ff7cde5e1693f05c90380e879f74d0c4bce5f1\nChange-Id: If268553440b8a0cbbe011b5396974fd864a7d083\n" }, { "commit": "f3f966faa6f46156726a338208f6c10a97d3fb4b", "tree": "b711c590fb7c9148d9e04f3c16a11c185bb34008", "parents": [ "3872d321d7d2c904963a1dee9c2d620b1f457de5", "649a27ad16faeb7a6bf87a50a33d19d461ece27c" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Wed Mar 04 17:42:04 2020 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Mar 04 17:42:04 2020 +0000" }, "message": "Merge \"Camera: Fix possible ExifUtils heap corruption\" into qt-dev" }, { "commit": "3872d321d7d2c904963a1dee9c2d620b1f457de5", "tree": "c7dd4e1762048d401f9d6169e008bb66ce2c53f7", "parents": [ "cadf7289e0dacf4a40422f0b36f97891649d398b", "509f1a5030ec005db387a4f0420af12e03d1b7f8" ], "author": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Mar 04 01:01:20 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Mar 04 01:01:20 2020 +0000" }, "message": "[automerger skipped] [DO NOT MERGE] Fix uninitialized data in IHDCP decrypt am: 58af3de44d am: 911b808a65 am: 8d2c3d65d0 -s ours am: 509f1a5030 -s ours\nam skip reason: subject contains skip directive\n\nChange-Id: Ic33fbec76dc8b7da4d6907e23eca5e0d5486e5d4\n" }, { "commit": "509f1a5030ec005db387a4f0420af12e03d1b7f8", "tree": "2926078ecc63d88d598b6e1541c9a267dbdf6596", "parents": [ "e492965229ce184a76eaffe2d9fdfcf9e3db7af2", "8d2c3d65d06bdf21a8fa4715352cb2a12a442579" ], "author": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Mar 04 00:47:34 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Mar 04 00:47:34 2020 +0000" }, "message": "[automerger skipped] [DO NOT MERGE] Fix uninitialized data in IHDCP decrypt am: 58af3de44d am: 911b808a65 am: 8d2c3d65d0 -s ours\nam skip reason: subject contains skip directive\n\nChange-Id: I685a75f65ec182f032e1da494132b590b9b281c9\n" }, { "commit": "8d2c3d65d06bdf21a8fa4715352cb2a12a442579", "tree": "f2489e7b4ec31cade8f1b12b4c7267ef7bc3bd08", "parents": [ "d0d078020e26dd9ff1f870491bbfef0f9b9560de", "911b808a6568fee9c2fd1aa89039161195873350" ], "author": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Mar 04 00:38:31 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Mar 04 00:38:31 2020 +0000" }, "message": "[DO NOT MERGE] Fix uninitialized data in IHDCP decrypt am: 58af3de44d am: 911b808a65\n\nChange-Id: Id9527a17ad36c249658b211b9f6b6073907666a9\n" }, { "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": "649a27ad16faeb7a6bf87a50a33d19d461ece27c", "tree": "b711c590fb7c9148d9e04f3c16a11c185bb34008", "parents": [ "cadf7289e0dacf4a40422f0b36f97891649d398b" ], "author": { "name": "Emilian Peev", "email": "epeev@google.com", "time": "Tue Feb 18 13:38:04 2020 -0800" }, "committer": { "name": "Emilian Peev", "email": "epeev@google.com", "time": "Tue Feb 18 13:38:04 2020 -0800" }, "message": "Camera: Fix possible ExifUtils heap corruption\n\nBoth EXIF_TAG_IMAGE_WIDTH and EXIF_TAG_IMAGE_LENGTH\nexpect short values as per EXIF spec. Call appropriate\nlibexif function to avoid possible heap corruption.\n\nBug: 148223871\nTest: run sts-engbuild-no-spl-lock -m StsHostTestCases --test android.security.sts.Poc20_02#testPocBug_148223871\nChange-Id: I57a774454b52c16d7da9f90d7e3a3407294606a5\n" }, { "commit": "cadf7289e0dacf4a40422f0b36f97891649d398b", "tree": "c7dd4e1762048d401f9d6169e008bb66ce2c53f7", "parents": [ "1142d3ea289b03f2143b789e65fd174ea4854634", "e492965229ce184a76eaffe2d9fdfcf9e3db7af2" ], "author": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Feb 13 00:12:28 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Feb 13 00:12:28 2020 +0000" }, "message": "Revert \"BnCrypto: fix use-before-init in CREATE_PLUGIN\" am: e4e7b91ec8 am: 36af5d0319 am: d0d078020e am: e492965229\n\nChange-Id: I66ee63192311c41c892747324b61368655da0db0\n" }, { "commit": "e492965229ce184a76eaffe2d9fdfcf9e3db7af2", "tree": "2926078ecc63d88d598b6e1541c9a267dbdf6596", "parents": [ "df156dc766918c12b1931eb79919b4db3c959b1a", "d0d078020e26dd9ff1f870491bbfef0f9b9560de" ], "author": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Feb 12 23:59:54 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Feb 12 23:59:54 2020 +0000" }, "message": "Revert \"BnCrypto: fix use-before-init in CREATE_PLUGIN\" am: e4e7b91ec8 am: 36af5d0319 am: d0d078020e\n\nChange-Id: I38c304066ea808014e288dd4ed6a2f89a34492cb\n" }, { "commit": "d0d078020e26dd9ff1f870491bbfef0f9b9560de", "tree": "2fcced65e527e9c934e8a424994a507150ae4f87", "parents": [ "f0791037c1676ecb6a4af39acabf33db02982545", "36af5d03196ce1ce41c753cdd63931072d2044ea" ], "author": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Feb 12 23:43:15 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Feb 12 23:43:15 2020 +0000" }, "message": "Revert \"BnCrypto: fix use-before-init in CREATE_PLUGIN\" am: e4e7b91ec8 am: 36af5d0319\n\nChange-Id: Ifa7bc3cd86f60b7fb0d557dbbad12dc7f5a1bcdb\n" }, { "commit": "36af5d03196ce1ce41c753cdd63931072d2044ea", "tree": "861aeab62263d1682d6b1528c06fc0b94a697510", "parents": [ "aca92198a127bb8a7d2e0ba9edcb52954bffcc24", "e4e7b91ec85c3b3bdeb74994a68f4bff0f26aefc" ], "author": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Feb 12 23:32:22 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Feb 12 23:32:22 2020 +0000" }, "message": "Revert \"BnCrypto: fix use-before-init in CREATE_PLUGIN\" am: e4e7b91ec8\n\nChange-Id: Ic58cdb7f33d8eb4acbae84a1fb6885341d177869\n" }, { "commit": "e4e7b91ec85c3b3bdeb74994a68f4bff0f26aefc", "tree": "482e55c9c1c39b62df473fa54ea3ca65520c9a6a", "parents": [ "51aa2003766aa35d6c6b3ee688a86e117c65b94d" ], "author": { "name": "Robert Shih", "email": "robertshih@google.com", "time": "Tue Feb 11 20:21:05 2020 +0000" }, "committer": { "name": "Robert Shih", "email": "robertshih@google.com", "time": "Wed Feb 12 05:01:54 2020 +0000" }, "message": "Revert \"BnCrypto: fix use-before-init in CREATE_PLUGIN\"\n\nThis reverts commit 51aa2003766aa35d6c6b3ee688a86e117c65b94d.\n\nReason for revert: DRM playback regression\n\nBug: 149067513\nChange-Id: I8d8a51efd57c52b444363ce5f5bd04316b2f4bb8\nMerged-In: Id67dc9e793ee886e4cc49370d800c7f3580df313\nMerged-In: I81ff7cde5e1693f05c90380e879f74d0c4bce5f1\n" }, { "commit": "1142d3ea289b03f2143b789e65fd174ea4854634", "tree": "b99f0f901765150cd44139d2457c03ae02068a77", "parents": [ "86021896f0811062a47001b20f14bc29badf68e3", "c45f1514dc4fa9df41976dccb195833e51bfc5bd" ], "author": { "name": "Oliver Nguyen", "email": "olivernguyen@google.com", "time": "Thu Feb 06 20:10:40 2020 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Feb 06 20:10:40 2020 +0000" }, "message": "Merge \"Move implementations to DataSourceBase.h\" into qt-dev" }, { "commit": "86021896f0811062a47001b20f14bc29badf68e3", "tree": "7f201d08c8e44a291da9563882041bd5bbe45d5b", "parents": [ "0ad729efbbe1951d4bad01eebea3843cb23b0420", "df156dc766918c12b1931eb79919b4db3c959b1a" ], "author": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Feb 06 00:25:51 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Feb 06 00:25:51 2020 +0000" }, "message": "BnCrypto: fix use-before-init in CREATE_PLUGIN am: 51aa200376 am: aca92198a1 am: f0791037c1 am: df156dc766\n\nChange-Id: I6324e5f0b8be2a3c9dd0d7936fc8379c8daa8365\n" }, { "commit": "df156dc766918c12b1931eb79919b4db3c959b1a", "tree": "e7d769ee251bd8503fd9c23de72b5d65ba55bfd2", "parents": [ "d651cdcfafd48df0ae0f50f83eb85a35ee5ab0cb", "f0791037c1676ecb6a4af39acabf33db02982545" ], "author": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Feb 06 00:05:15 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Feb 06 00:05:15 2020 +0000" }, "message": "BnCrypto: fix use-before-init in CREATE_PLUGIN am: 51aa200376 am: aca92198a1 am: f0791037c1\n\nChange-Id: Iabb65b41883e0b46a7c0ea2e1a98accba1377eae\n" }, { "commit": "f0791037c1676ecb6a4af39acabf33db02982545", "tree": "a3ad8bf44e83cb5090efe266fba8725836cbf115", "parents": [ "6cf42dbae74a1237cf8861888f990280abbd6ef5", "aca92198a127bb8a7d2e0ba9edcb52954bffcc24" ], "author": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Feb 05 23:52:31 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Feb 05 23:52:31 2020 +0000" }, "message": "BnCrypto: fix use-before-init in CREATE_PLUGIN am: 51aa200376 am: aca92198a1\n\nChange-Id: I19571d507f1234ece0d63542688063f087cf6bd7\n" }, { "commit": "aca92198a127bb8a7d2e0ba9edcb52954bffcc24", "tree": "5d1f140af64c3b4e00860ec902a3447f1509f0e9", "parents": [ "e545f3c8d3f02b80e0fb10c579510167be91da8b", "51aa2003766aa35d6c6b3ee688a86e117c65b94d" ], "author": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Feb 05 23:40:34 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Feb 05 23:40:34 2020 +0000" }, "message": "BnCrypto: fix use-before-init in CREATE_PLUGIN am: 51aa200376\n\nChange-Id: I8c30b0d77d2f5fae31afd7d1ed4cae194078630f\n" }, { "commit": "51aa2003766aa35d6c6b3ee688a86e117c65b94d", "tree": "b13d91733897c04147f067dfd9d9b68a69de0f37", "parents": [ "efd8f9e09a1333e85802e855bd15ceca8948baed" ], "author": { "name": "Robert Shih", "email": "robertshih@google.com", "time": "Tue Feb 04 17:23:58 2020 -0800" }, "committer": { "name": "Robert Shih", "email": "robertshih@google.com", "time": "Wed Feb 05 18:56:51 2020 +0000" }, "message": "BnCrypto: fix use-before-init in CREATE_PLUGIN\n\nBug: 144767096\nTest: poc_ICrypto_283\nChange-Id: Icd57367f8d912ff0a0cf9067c732b8fce169f29d\nMerged-In: Id67dc9e793ee886e4cc49370d800c7f3580df313\n" }, { "commit": "c45f1514dc4fa9df41976dccb195833e51bfc5bd", "tree": "1cf583f8b22c473f4eef7b01403840ba420f57c5", "parents": [ "a67cf12a109f36152600a621a7c979b4ab273dd9" ], "author": { "name": "Dongwon Kang", "email": "dwkang@google.com", "time": "Thu Aug 15 13:46:00 2019 -0700" }, "committer": { "name": "Oliver Nguyen", "email": "olivernguyen@google.com", "time": "Tue Feb 04 22:26:20 2020 +0000" }, "message": "Move implementations to DataSourceBase.h\n\nSome lib*extractors include DataSourceBase.h but are not\nlinking libstagefright which has the implementation.\nThis doesn\u0027t cause any build issue in normal build, but\nit actually matters when NATIVE_COVERAGE\u003dtrue which uses -O0.\n\nFixing by moving the implementation to the header.\n\nBug: 139459652\nBug: 148178774\nBug: 148177815\nTest: m\nTest: NATIVE_COVERAGE\u003dtrue COVERAGE_PATHS\u003d\"*\" m\nChange-Id: Ic955189ff9f0fbc48b5b35eccdb2916dc79fdb0f\nMerged-In: Ic955189ff9f0fbc48b5b35eccdb2916dc79fdb0f\n(cherry picked from commit 45bee32c4c81ea7def34c77256383cc5a0bf1333)\n" }, { "commit": "0ad729efbbe1951d4bad01eebea3843cb23b0420", "tree": "3c3c37e358d0e1a0227b5a6ce4e82f14de44d760", "parents": [ "a67cf12a109f36152600a621a7c979b4ab273dd9" ], "author": { "name": "Ray Essick", "email": "essick@google.com", "time": "Tue Nov 05 15:07:27 2019 -0800" }, "committer": { "name": "Oliver Nguyen", "email": "olivernguyen@google.com", "time": "Tue Feb 04 18:58:28 2020 +0000" }, "message": "jailed media processes can dump code coverage data\n\nuse @include to bring in the minijail policy information needed so that\nwe can write out code coverage information on such builds; the included\ncode coverage policy files is appropriate full/empty based on code\ncoverage flags.\n\nBug: 139313557\nBug: 148178774\nBug: 148177815\nTest: \u0027kill -37\u0027 on processes in a code-coverage-enabled build\nTest: \u0027kill -37\u0027 on processes in a NON code-coverage-enabled build\nChange-Id: I9d5880343347ddc586e50f9eafb65e1ff7ba3748\n(cherry picked from commit 40d50f3fead98414d4c4a5627c179cbf20c3b86e)\n" }, { "commit": "a67cf12a109f36152600a621a7c979b4ab273dd9", "tree": "427f1b0bdf86ce803c1b84f12bafc828c42dcc28", "parents": [ "5b4757c2bb4359b7272d3bb85e0613d07871ddac", "d651cdcfafd48df0ae0f50f83eb85a35ee5ab0cb" ], "author": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Jan 23 21:11:09 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Jan 23 21:11:09 2020 +0000" }, "message": "[automerger skipped] Merge \"[DO NOT MERGE] Fix heap buffer overflow in clearkey CryptoPlugin::decrypt\" into pi-dev am: d651cdcfaf -s ours\nam skip reason: subject contains skip directive\n\nChange-Id: Ieedde35228fba4fa4b882bb1de8e8b092e71b459\n" }, { "commit": "d651cdcfafd48df0ae0f50f83eb85a35ee5ab0cb", "tree": "2926078ecc63d88d598b6e1541c9a267dbdf6596", "parents": [ "2587ab6c7642062ea1791de1868c28b1164a073c", "dc4c427b2155a9928a7cdaac7c0a787dd9c8192d" ], "author": { "name": "Edwin Wong", "email": "edwinwong@google.com", "time": "Thu Jan 23 20:59:59 2020 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Jan 23 20:59:59 2020 +0000" }, "message": "Merge \"[DO NOT MERGE] Fix heap buffer overflow in clearkey CryptoPlugin::decrypt\" into pi-dev" }, { "commit": "5b4757c2bb4359b7272d3bb85e0613d07871ddac", "tree": "427f1b0bdf86ce803c1b84f12bafc828c42dcc28", "parents": [ "63a3347443eeb35d5f73bf13dd882d67c09d03bc", "d81917505eda818d64135a8226a529b3901dee4b" ], "author": { "name": "Edwin Wong", "email": "edwinwong@google.com", "time": "Thu Jan 23 20:58:58 2020 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Jan 23 20:58:58 2020 +0000" }, "message": "Merge \"[DO NOT MERGE] Fix heap buffer overflow in clearkey CryptoPlugin::decrypt\" into qt-dev" }, { "commit": "63a3347443eeb35d5f73bf13dd882d67c09d03bc", "tree": "6264825f410a8c258c40002cedeb448869b1c2b4", "parents": [ "b92e3bf778ab8dcf28193cfb63c40dd964644c47", "2587ab6c7642062ea1791de1868c28b1164a073c" ], "author": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Jan 22 21:53:21 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Jan 22 21:53:21 2020 +0000" }, "message": "[automerger skipped] [DO NOT MERGE] Fix heap buffer overflow for releaseSecureStops. am: 2587ab6c76 -s ours\nam skip reason: subject contains skip directive\n\nChange-Id: Ib5a57249b540e8f5aa1164f822dac463ee4b0904\n" }, { "commit": "dc4c427b2155a9928a7cdaac7c0a787dd9c8192d", "tree": "853f066e1e6e5e271cc17315708f1033659fbb5c", "parents": [ "1d2cccfd2abecda52b49f123bf5905079578c542" ], "author": { "name": "Edwin Wong", "email": "edwinwong@google.com", "time": "Tue Dec 17 17:56:17 2019 -0800" }, "committer": { "name": "Edwin Wong", "email": "edwinwong@google.com", "time": "Thu Jan 16 22:52:46 2020 +0000" }, "message": "[DO NOT MERGE] Fix heap buffer overflow in clearkey CryptoPlugin::decrypt\n\nFix destPtr was not pointing to destination raw pointer.\n\nbug: 144506242\n\nTest: sts\n ANDROID_BUILD_TOP\u003d ./android-sts/tools/sts-tradefed run sts-engbuild-no-spl-lock -m StsHostTestCases --test android.security.sts.Poc19_12#testPocBug_144506242\n\nChange-Id: I9425baa21c82d5a5edf37c87989adbade0428b67\n" }, { "commit": "d81917505eda818d64135a8226a529b3901dee4b", "tree": "87b5bba8ede0e6450906e62c18596dec8e30a357", "parents": [ "7b254210fe701b9023d1db342c6d1c884d39efe7" ], "author": { "name": "Edwin Wong", "email": "edwinwong@google.com", "time": "Tue Dec 17 14:37:57 2019 -0800" }, "committer": { "name": "Edwin Wong", "email": "edwinwong@google.com", "time": "Wed Jan 08 16:08:40 2020 -0800" }, "message": "[DO NOT MERGE] Fix heap buffer overflow in clearkey CryptoPlugin::decrypt\n\nFix destPtr was not pointing to destination raw pointer.\n\nbug: 144506242\n\nTest: sts\n ANDROID_BUILD_TOP\u003d ./android-sts/tools/sts-tradefed run sts-engbuild-no-spl-lock -m StsHostTestCases --test android.security.sts.Poc19_12#testPocBug_144506242\n\nChange-Id: Ifc9f3999e28c9216c476cab432248eb6c320de43\n" }, { "commit": "b92e3bf778ab8dcf28193cfb63c40dd964644c47", "tree": "6264825f410a8c258c40002cedeb448869b1c2b4", "parents": [ "7b254210fe701b9023d1db342c6d1c884d39efe7" ], "author": { "name": "Edwin Wong", "email": "edwinwong@google.com", "time": "Tue Nov 26 17:52:52 2019 -0800" }, "committer": { "name": "Edwin Wong", "email": "edwinwong@google.com", "time": "Wed Jan 08 01:29:58 2020 +0000" }, "message": "[DO NOT MERGE] Fix heap buffer overflow for releaseSecureStops.\n\nIf the input SecureStopRelease size is less than sizeof(uint32_t)\nin releaseSecureStops(), an out of bound read will occur.\n\nbug: 144766455\nbug: 144746235\nbug: 147281068\n\nTest: sts\nANDROID_BUILD_TOP\u003d ./android-sts/tools/sts-tradefed run sts-engbuild-no-spl-lock -m StsHostTestCases --test android.security.sts.Poc19_11#testPocBug_144766455\n\nChange-Id: Ibee5a105eaedfee37d2fa93f7024f63f30cc7409\n" }, { "commit": "2587ab6c7642062ea1791de1868c28b1164a073c", "tree": "6c2e29839ae30177cc4b9e21b51a02159767fa33", "parents": [ "1d2cccfd2abecda52b49f123bf5905079578c542" ], "author": { "name": "Edwin Wong", "email": "edwinwong@google.com", "time": "Tue Nov 26 14:40:45 2019 -0800" }, "committer": { "name": "Edwin Wong", "email": "edwinwong@google.com", "time": "Wed Jan 08 01:20:01 2020 +0000" }, "message": "[DO NOT MERGE] Fix heap buffer overflow for releaseSecureStops.\n\nIf the input SecureStopRelease size is less than sizeof(uint32_t)\nin releaseSecureStops(), an out of bound read will occur.\n\nbug: 144766455\nbug: 144746235\nbug: 147281068\n\nTest: sts\nANDROID_BUILD_TOP\u003d ./android-sts/tools/sts-tradefed run sts-engbuild-no-spl-lock -m StsHostTestCases --test android.security.sts.Poc19_11#testPocBug_144766455\n\nChange-Id: I050504c1ef4e5c41fb47ee97e98db41399288a91\n" }, { "commit": "7b254210fe701b9023d1db342c6d1c884d39efe7", "tree": "c4e1d5f2e3235e4ee8c2c561d03cb5d36167458f", "parents": [ "4a47595eceb1da9150e38b02b2e5e79290300a85", "7307293e8befafa12b244b74cd3c8cb84b27997c" ], "author": { "name": "Jean-Michel Trivi", "email": "jmtrivi@google.com", "time": "Thu Oct 03 22:18:24 2019 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Oct 03 22:18:24 2019 +0000" }, "message": "Merge \"AudioFlinger: enforce OP_RECORD_AUDIO during recording\" into qt-dev" }, { "commit": "4a47595eceb1da9150e38b02b2e5e79290300a85", "tree": "9fce8b84216e4fe4fdb837fe1e87811f979cf5d1", "parents": [ "ae55cbf717757115f53b8a9cf71ba76e763599ce", "1d2cccfd2abecda52b49f123bf5905079578c542" ], "author": { "name": "Jean-Michel Trivi", "email": "jmtrivi@google.com", "time": "Thu Oct 03 11:04:45 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Oct 03 11:04:45 2019 -0700" }, "message": "[automerger skipped] Merge \"AudioFlinger: enforce OP_RECORD_AUDIO during recording\" into pi-dev\nam: 1d2cccfd2a -s ours\nam skip reason: SHA1 1d2cccfd2a skipped by user jmtrivi\n\nChange-Id: I314e39906408bff99d4e0a7cab95b8db640b4b63\n" }, { "commit": "1d2cccfd2abecda52b49f123bf5905079578c542", "tree": "ec1a0da9244843b5a907d73afed87baffb5e7582", "parents": [ "5dd7590c6c6fcedd77ac5ec2dd97c8badfb9eb36", "43def76fcdb1d3a9b14a3f19a4c8a33534f8b003" ], "author": { "name": "Jean-Michel Trivi", "email": "jmtrivi@google.com", "time": "Thu Oct 03 17:02:59 2019 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Oct 03 17:02:59 2019 +0000" }, "message": "Merge \"AudioFlinger: enforce OP_RECORD_AUDIO during recording\" into pi-dev" }, { "commit": "7307293e8befafa12b244b74cd3c8cb84b27997c", "tree": "db965b2dafa54ec2460e83292bbc6f9b2cb5ecaf", "parents": [ "a426cf1c3d42d2e17212bd0aa5fbfe7517ad3284" ], "author": { "name": "Jean-Michel Trivi", "email": "jmtrivi@google.com", "time": "Tue Aug 20 15:42:04 2019 -0700" }, "committer": { "name": "Suprabh Shukla", "email": "suprabh@google.com", "time": "Mon Sep 16 13:59:25 2019 -0700" }, "message": "AudioFlinger: enforce OP_RECORD_AUDIO during recording\n\n Fix issue where RecordTrack silencing didn\u0027t silence the\nfull buffer: the memset to 0 was using the RecordThread frame\nsize, not the RecordTrack frame size.\n OP_RECORD_AUDIO was only enforced at the start of a recording\nwhich would fail if not granted. This patch silences the recording\n(i.e. silence is recorded instead) when it is lost, and undoes that\nwhen granted again. This requires:\n- propagating the package name of the client to the RecordTrack class\n- registering an appOp callback in RecordTrack (through a new\n OpRecordAudioMonitor class) to (un)silence the recording\n- update the isSilenced() method to take into account the appOp.\n\nBug: 138968594\nBug: 138636979\nTest: run app that records audio, then \"adb shell appops __pack_name__ 27 2\"\n and verify recording is silent after that.\n\nChange-Id: Ib33f5b592185a67204997213bab1ac2594d90d37\n(cherry picked from commit ddf87effa4d80f413a80fde861f73877ccd80599)\nMerged-In: Ib33f5b592185a67204997213bab1ac2594d90d37\n" }, { "commit": "ae55cbf717757115f53b8a9cf71ba76e763599ce", "tree": "9fce8b84216e4fe4fdb837fe1e87811f979cf5d1", "parents": [ "15437f1e0033c3af216eb9a42fbcb4eb1a779210" ], "author": { "name": "Ray Essick", "email": "essick@google.com", "time": "Fri Sep 13 09:20:20 2019 -0700" }, "committer": { "name": "Ray Essick", "email": "essick@google.com", "time": "Sun Sep 15 14:48:25 2019 +0000" }, "message": "force g711 test to match 1-channel sample data\n\nspecial case the g711 test to know that it is a 1-channel input.\nTest case itself can\u0027t infer the channel count from the g711 stream\nsince there is no header/control info within the g711 stream.\n\nBug: 140773833\nTest: vts-tradefed run vts --module VtsHalMediaC2V1_0Host\nChange-Id: I9ac1f4d3ee0ccc42ffc8c199fcb88dc5c7122c0e\n(cherry picked from commit 72b55c5e31a3835a15349dffe24d8acd49adadc3)\n" }, { "commit": "15437f1e0033c3af216eb9a42fbcb4eb1a779210", "tree": "b68fcf98965189a0cfe5d317b2d57b4c30efbbe6", "parents": [ "e0ed98533c6c32f0497aa6f5352f628ee469479a", "5dd7590c6c6fcedd77ac5ec2dd97c8badfb9eb36" ], "author": { "name": "Robert Shih", "email": "robertshih@google.com", "time": "Tue Sep 10 14:25:13 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Sep 10 14:25:13 2019 -0700" }, "message": "[automerger skipped] [RESTRICT AUTOMERGE] clearkey hidl CryptoPlugin: security fixes\nam: 5dd7590c6c -s ours\nam skip reason: subject contains skip directive\n\nChange-Id: I4a61813e541e06fa67ca60379e09f1337880dc62\n" }, { "commit": "e0ed98533c6c32f0497aa6f5352f628ee469479a", "tree": "b68fcf98965189a0cfe5d317b2d57b4c30efbbe6", "parents": [ "2322d0f769f63d977e7480e98d193fdca7c1d265", "d23bd2a2a80f6bfc8c827bf21e53ad4500582d56" ], "author": { "name": "Robert Shih", "email": "robertshih@google.com", "time": "Tue Sep 10 21:06:55 2019 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Sep 10 21:06:55 2019 +0000" }, "message": "Merge \"clearkey hidl CryptoPlugin: misc \u0026 security fixes\" into qt-dev" }, { "commit": "43def76fcdb1d3a9b14a3f19a4c8a33534f8b003", "tree": "2d92bb5117c35acdb1a76b06ccf5981132d1500e", "parents": [ "874ec86ebc323baa7e6a6ab784dc4550444d6aa6" ], "author": { "name": "Jean-Michel Trivi", "email": "jmtrivi@google.com", "time": "Tue Aug 20 15:42:04 2019 -0700" }, "committer": { "name": "Jean-Michel Trivi", "email": "jmtrivi@google.com", "time": "Wed Aug 28 16:35:24 2019 +0000" }, "message": "AudioFlinger: enforce OP_RECORD_AUDIO during recording\n\n Fix issue where RecordTrack silencing didn\u0027t silence the\nfull buffer: the memset to 0 was using the RecordThread frame\nsize, not the RecordTrack frame size.\n OP_RECORD_AUDIO was only enforced at the start of a recording\nwhich would fail if not granted. This patch silences the recording\n(i.e. silence is recorded instead) when it is lost, and undoes that\nwhen granted again. This requires:\n- propagating the package name of the client to the RecordTrack class\n- registering an appOp callback in RecordTrack (through a new\n OpRecordAudioMonitor class) to (un)silence the recording\n- update the isSilenced() method to take into account the appOp.\n\nBug: 138968594\nBug: 138636979\nTest: run app that records audio, then \"adb shell appops __pack_name__ 27 2\"\n and verify recording is silent after that.\n\nChange-Id: I4ebdb2f02409fdf045a77132bf7a1b24249ad948\nMerged-In: Ib33f5b592185a67204997213bab1ac2594d90d37\n" }, { "commit": "2322d0f769f63d977e7480e98d193fdca7c1d265", "tree": "1b101adddcdd0444a20904e85a34d96805fc2012", "parents": [ "f08d61d30e9ed041d7426c0168e2ee092eaf36ac", "cf9526cffcf206d38b81de5651d1ecedf09921f6" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Tue Aug 27 04:29:01 2019 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Aug 27 04:29:01 2019 +0000" }, "message": "Merge \"Add sub-elements for \"Variant\" type\" into qt-dev" }, { "commit": "d23bd2a2a80f6bfc8c827bf21e53ad4500582d56", "tree": "4eb3b480f0b476e914ba619c77f15b71b4ffc587", "parents": [ "f08d61d30e9ed041d7426c0168e2ee092eaf36ac" ], "author": { "name": "Robert Shih", "email": "robertshih@google.com", "time": "Mon Aug 26 17:03:13 2019 -0700" }, "committer": { "name": "Robert Shih", "email": "robertshih@google.com", "time": "Mon Aug 26 17:53:27 2019 -0700" }, "message": "clearkey hidl CryptoPlugin: misc \u0026 security fixes\n\n* propagate decrypt error message\n* reject native handle output\n* validate subsample sizes\n\nBug: 137283376\nTest: cryptopoc\nChange-Id: Ic4267fdc0e391bdecc1caab3b8fd4aa34ad76541\n" }, { "commit": "5dd7590c6c6fcedd77ac5ec2dd97c8badfb9eb36", "tree": "aa39cb7ba612c2ca194b66e8d8d84dbb7fa46cbe", "parents": [ "874ec86ebc323baa7e6a6ab784dc4550444d6aa6" ], "author": { "name": "Robert Shih", "email": "robertshih@google.com", "time": "Mon Aug 26 17:03:13 2019 -0700" }, "committer": { "name": "Robert Shih", "email": "robertshih@google.com", "time": "Mon Aug 26 17:51:28 2019 -0700" }, "message": "[RESTRICT AUTOMERGE] clearkey hidl CryptoPlugin: security fixes\n\n* reject native handle output\n* validate subsample sizes\n\nBug: 137283376\nTest: cryptopoc\nChange-Id: Ic4267fdc0e391bdecc1caab3b8fd4aa34ad76541\n" }, { "commit": "cf9526cffcf206d38b81de5651d1ecedf09921f6", "tree": "f0f072b23bf382bcd2e1fa8fc08430195c68b888", "parents": [ "b9df2ec036b3a4ecf70e5cdcefdfb8939b4ae18e" ], "author": { "name": "Sundong Ahn", "email": "sundongahn@google.com", "time": "Thu Aug 22 22:54:02 2019 +0900" }, "committer": { "name": "Sundong Ahn", "email": "sundongahn@google.com", "time": "Thu Aug 22 14:06:47 2019 +0000" }, "message": "Add sub-elements for \"Variant\" type\n\nThe Quirk, Attribute, Alias, Limit and Feature elements are added to\n\"Variant\" type for fixing VTS error.\n\nBug: 139506623\nTest: m -j40 vts \u0026\u0026 vts-tradefed run vts -m VtsValidateMediaCodecs\nChange-Id: I55066cc1de8b820c24faccdfb469377c897e9808\n" }, { "commit": "f08d61d30e9ed041d7426c0168e2ee092eaf36ac", "tree": "15aa4deb117cff0d4ae01c3ed31ddd78e0b4414e", "parents": [ "b9df2ec036b3a4ecf70e5cdcefdfb8939b4ae18e" ], "author": { "name": "Pawin Vongmasa", "email": "pawin@google.com", "time": "Fri Aug 09 21:57:44 2019 -0700" }, "committer": { "name": "Pawin Vongmasa", "email": "pawin@google.com", "time": "Thu Aug 22 07:29:16 2019 +0000" }, "message": "Codec2 VTS: Move device resource files to data/local/tmp\n\nSome devices make /sdcard a symbolic link to a non-constant target. The\ntarget changes between the setup and the execution, so files pushed to\n/sdcard during the setup cannot be found when the test runs.\n\nTest: vts-tradefed run vts -m VtsHalMediaC2V1_0Host\n\nBug: 138388013\nChange-Id: Ia27bd9eedfc6f97225abb553c4b8efbb8957966e\n" }, { "commit": "b9df2ec036b3a4ecf70e5cdcefdfb8939b4ae18e", "tree": "a3f46fbd197ab1771b823aa490dc125cedbad688", "parents": [ "b2f9f22cfa3b3d11a233b36aa2e7058867b3d777", "732e5fab3dc2d06901b5f56163a01fda6f5364b8" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Wed Aug 14 01:16:45 2019 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Aug 14 01:16:45 2019 +0000" }, "message": "Merge \"Check the media.settings.xml property\" into qt-dev" }, { "commit": "b2f9f22cfa3b3d11a233b36aa2e7058867b3d777", "tree": "70d3470aef91faafbc53b1ba0487812705a19a07", "parents": [ "69fb36f0d15c39b616e92642522f93f678bf3315", "bc3245623c3d4408dcfb9c727d2b9b1935a36a7a" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Mon Aug 12 20:37:20 2019 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Aug 12 20:37:20 2019 +0000" }, "message": "Merge \"Revert \"aacenc: fix timestamp off by one frame\"\" into qt-dev" }, { "commit": "bc3245623c3d4408dcfb9c727d2b9b1935a36a7a", "tree": "fe812669d009ddb4c7148d791a65a4961b9c533c", "parents": [ "10ceef9f3b96e5c7bc783432fe569333a2405cf0" ], "author": { "name": "Akshay Thakker", "email": "aksh@google.com", "time": "Mon Aug 12 17:16:11 2019 +0000" }, "committer": { "name": "Akshay Thakker", "email": "aksh@google.com", "time": "Mon Aug 12 17:16:11 2019 +0000" }, "message": "Revert \"aacenc: fix timestamp off by one frame\"\n\nThis reverts commit 10ceef9f3b96e5c7bc783432fe569333a2405cf0.\n\nReason for revert: This isn\u0027t wanted in qt-dev. It is in qt-r1-dev and will be delivered in the December Mainline train.\n\nBug: 137245963\nChange-Id: I0a5a4991786d6dcbd324663a6d342729166a5528\nMerged-In: I567890f3d04544c12adfe29a6a23c06f1db699e7\n" }, { "commit": "732e5fab3dc2d06901b5f56163a01fda6f5364b8", "tree": "1cafa37905830080e62c49c59f6d368a17e7d221", "parents": [ "69fb36f0d15c39b616e92642522f93f678bf3315" ], "author": { "name": "Sundong Ahn", "email": "sundongahn@google.com", "time": "Tue Jul 30 20:43:43 2019 +0900" }, "committer": { "name": "Sundong Ahn", "email": "sundongahn@google.com", "time": "Mon Aug 12 17:59:50 2019 +0900" }, "message": "Check the media.settings.xml property\n\nThe file name and path of the media profiles can be changed by\nmedia.settings.xml property. So befor test, we should check\nmedia.settings.xml property.\n\nBug: 138413934\nTest: vts-tradefed run vts -m VtsValidateMediaProfiles\nChange-Id: Ib7070cca94b9d637b9a1a175d09baf7b78ec0fd9\nMerged-In: Ib7070cca94b9d637b9a1a175d09baf7b78ec0fd9\n(cherry picked from commit ef8695ed8435b10bf9ae5f5e5b22f1d8a4d716d8)\n" }, { "commit": "69fb36f0d15c39b616e92642522f93f678bf3315", "tree": "683d8b8b75349597f209608caa492bf4245bb113", "parents": [ "ddf94140d726434976d5f1b13a07964123478f2f", "10ceef9f3b96e5c7bc783432fe569333a2405cf0" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Fri Aug 02 13:48:17 2019 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Aug 02 13:48:17 2019 +0000" }, "message": "Merge \"aacenc: fix timestamp off by one frame\" into qt-dev" }, { "commit": "ddf94140d726434976d5f1b13a07964123478f2f", "tree": "70d3470aef91faafbc53b1ba0487812705a19a07", "parents": [ "c833ccc86b8af68cfb80de182309be6d4eaac860", "874ec86ebc323baa7e6a6ab784dc4550444d6aa6" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Thu Aug 01 16:26:56 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Aug 01 16:26:56 2019 -0700" }, "message": "[automerger] Fix OOB access in mpeg4/h263 decoder am: ef4ce15700 am: 9832a2a3f4 am: 144ba69187 am: 6fa588c7b6 am: 88c0c4897c am: efd8f9e09a am: e545f3c8d3 am: 6cf42dbae7\nam: 874ec86ebc\n\nChange-Id: I1929d2d767bf662cfcef612b54ed10aa4c0fb460\n" }, { "commit": "874ec86ebc323baa7e6a6ab784dc4550444d6aa6", "tree": "5acaa25657e1c804fa8321b4ee74f1914ff142c6", "parents": [ "b44663498f7e6513b4fe23db1362be80e7f28ad6", "6cf42dbae74a1237cf8861888f990280abbd6ef5" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Thu Aug 01 16:16:08 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Aug 01 16:16:08 2019 -0700" }, "message": "[automerger] Fix OOB access in mpeg4/h263 decoder am: ef4ce15700 am: 9832a2a3f4 am: 144ba69187 am: 6fa588c7b6 am: 88c0c4897c am: efd8f9e09a am: e545f3c8d3\nam: 6cf42dbae7\n\nChange-Id: Iae11a06a5f69d5528195a1856106c3ebc2cfee49\n" }, { "commit": "6cf42dbae74a1237cf8861888f990280abbd6ef5", "tree": "2fcced65e527e9c934e8a424994a507150ae4f87", "parents": [ "4e314d9197ce973089cdadb8515444f418d5712e", "e545f3c8d3f02b80e0fb10c579510167be91da8b" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Thu Aug 01 16:03:02 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Aug 01 16:03:02 2019 -0700" }, "message": "[automerger] Fix OOB access in mpeg4/h263 decoder am: ef4ce15700 am: 9832a2a3f4 am: 144ba69187 am: 6fa588c7b6 am: 88c0c4897c am: efd8f9e09a\nam: e545f3c8d3\n\nChange-Id: Ic82cb29ade87f3bdee2504792206c7ae2f03456c\n" }, { "commit": "e545f3c8d3f02b80e0fb10c579510167be91da8b", "tree": "861aeab62263d1682d6b1528c06fc0b94a697510", "parents": [ "3c1c45dd71bf40976879caab9fafec81035d5666", "efd8f9e09a1333e85802e855bd15ceca8948baed" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Thu Aug 01 15:44:48 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Aug 01 15:44:48 2019 -0700" }, "message": "[automerger] Fix OOB access in mpeg4/h263 decoder am: ef4ce15700 am: 9832a2a3f4 am: 144ba69187 am: 6fa588c7b6 am: 88c0c4897c\nam: efd8f9e09a\n\nChange-Id: Ifa62d98915c01f3605e73479126347ddb2fdb92d\n" }, { "commit": "10ceef9f3b96e5c7bc783432fe569333a2405cf0", "tree": "5285033bdda612977438b51a24216a789fc32dcc", "parents": [ "c833ccc86b8af68cfb80de182309be6d4eaac860" ], "author": { "name": "Wonsik Kim", "email": "wonsik@google.com", "time": "Mon Jul 15 12:36:22 2019 -0700" }, "committer": { "name": "Jose Cubero", "email": "josecubero@google.com", "time": "Thu Aug 01 17:16:58 2019 +0000" }, "message": "aacenc: fix timestamp off by one frame\n\nBug: 137245963\nTest: manual\nChange-Id: I567890f3d04544c12adfe29a6a23c06f1db699e7\n(cherry picked from commit 8c886ae968a80321f0269825f186c75853645d61)\n" }, { "commit": "efd8f9e09a1333e85802e855bd15ceca8948baed", "tree": "482e55c9c1c39b62df473fa54ea3ca65520c9a6a", "parents": [ "e82c14f41dd6e183a83a6df18b245dd9c50722ea", "88c0c4897c8d3c5c29748fff0bf9d69fb35cf231" ], "author": { "name": "Android Build Merger (Role)", "email": "noreply-android-build-merger@google.com", "time": "Wed Jul 24 17:33:19 2019 +0000" }, "committer": { "name": "Android Build Merger (Role)", "email": "noreply-android-build-merger@google.com", "time": "Wed Jul 24 17:33:19 2019 +0000" }, "message": "[automerger] Fix OOB access in mpeg4/h263 decoder am: ef4ce15700 am: 9832a2a3f4 am: 144ba69187 am: 6fa588c7b6 am: 88c0c4897c\n\nChange-Id: I8958693ac165e148e56dc682f1b55cbcd18c3754\n" }, { "commit": "88c0c4897c8d3c5c29748fff0bf9d69fb35cf231", "tree": "3628dc85dd6979d94b6b6a076e89c9e195bb2f97", "parents": [ "ee98fbf5845ff20981c2de718ee228effab4484b", "6fa588c7b61e00a98461870294f5279667fa921b" ], "author": { "name": "Android Build Merger (Role)", "email": "noreply-android-build-merger@google.com", "time": "Wed Jul 24 17:33:17 2019 +0000" }, "committer": { "name": "Android Build Merger (Role)", "email": "noreply-android-build-merger@google.com", "time": "Wed Jul 24 17:33:17 2019 +0000" }, "message": "[automerger] Fix OOB access in mpeg4/h263 decoder am: ef4ce15700 am: 9832a2a3f4 am: 144ba69187 am: 6fa588c7b6\n\nChange-Id: I9880e8be2ac6cf928ea139bff99a007bf38aa3eb\n" }, { "commit": "6fa588c7b61e00a98461870294f5279667fa921b", "tree": "4bff936b3c1c958c91454ac8a5b7e2edbbf7ea05", "parents": [ "c9528234a117559621b98663e016d0757c160df2", "144ba691873f4dbcdbaa5a53c208bd25b31932cf" ], "author": { "name": "Android Build Merger (Role)", "email": "noreply-android-build-merger@google.com", "time": "Wed Jul 24 17:33:16 2019 +0000" }, "committer": { "name": "Android Build Merger (Role)", "email": "noreply-android-build-merger@google.com", "time": "Wed Jul 24 17:33:16 2019 +0000" }, "message": "[automerger] Fix OOB access in mpeg4/h263 decoder am: ef4ce15700 am: 9832a2a3f4 am: 144ba69187\n\nChange-Id: Ie6b0359a394ea7669be0cd7be4f1005c7e8dbb92\n" }, { "commit": "144ba691873f4dbcdbaa5a53c208bd25b31932cf", "tree": "b2a6131c9371cb982cbb35f471517361f6edc92d", "parents": [ "644ad716f0a5ff794aa1a403b0d2fc7164382e7e", "9832a2a3f469d344a82ffc6288abd9fc4bdcb61d" ], "author": { "name": "Android Build Merger (Role)", "email": "noreply-android-build-merger@google.com", "time": "Wed Jul 24 17:33:14 2019 +0000" }, "committer": { "name": "Android Build Merger (Role)", "email": "noreply-android-build-merger@google.com", "time": "Wed Jul 24 17:33:14 2019 +0000" }, "message": "[automerger] Fix OOB access in mpeg4/h263 decoder am: ef4ce15700 am: 9832a2a3f4\n\nChange-Id: I94d3301f216945075838b6cc46e7644f8e91a313\n" }, { "commit": "9832a2a3f469d344a82ffc6288abd9fc4bdcb61d", "tree": "a4e201506092da308493d398b4f6ab7a187d235d", "parents": [ "08aa2367b5f627068249b8a1003365ac2d16b1cc", "ef4ce157000b2b5bcbf2bcb36a228ec604803547" ], "author": { "name": "Android Build Merger (Role)", "email": "noreply-android-build-merger@google.com", "time": "Wed Jul 24 17:33:12 2019 +0000" }, "committer": { "name": "Android Build Merger (Role)", "email": "noreply-android-build-merger@google.com", "time": "Wed Jul 24 17:33:12 2019 +0000" }, "message": "[automerger] Fix OOB access in mpeg4/h263 decoder am: ef4ce15700\n\nChange-Id: I704568c683a2ec4dc5ee5bf5e977c2300f41061a\n" }, { "commit": "ef4ce157000b2b5bcbf2bcb36a228ec604803547", "tree": "d0372c38f6c48e9a530d7dbcc0b504e0d62a2fea", "parents": [ "7802c68aebf7908983508fd4a52a7d53746a80eb" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Tue Jul 23 08:27:46 2019 -0700" }, "committer": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Wed Jul 24 17:33:10 2019 +0000" }, "message": "Fix OOB access in mpeg4/h263 decoder\n\nThe decoder does not support an increase in frame width, and\nwould exceed its buffer if the width increased mid-stream.\nThere was an existing check to prevent the total frame size\n(width*height) from increasing, but in fact the decoder also\ndoes not even support a width increase, even if the height\ndecreases correspondingly.\n\nBug: 136175447\nBug: 136173699\nTest: manual\nChange-Id: Ic2d28bb0503635dadeb69ba3be9412d58684e910\n" }, { "commit": "c833ccc86b8af68cfb80de182309be6d4eaac860", "tree": "fe812669d009ddb4c7148d791a65a4961b9c533c", "parents": [ "5e39adb1c42dabd229fa416f4bb484181418e016" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Sat Jul 13 09:32:47 2019 -0700" }, "committer": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Wed Jul 17 02:49:54 2019 +0000" }, "message": "audio policy: fix mmap capture disconnect\n\nForce close mmap input streams when a capture device is\nconnected to force disconnect callback to client.\n\nBug: 137311579\nTest: capture with oboetester and connect headset\nChange-Id: Iafe939247fa565e2424b40afacdb79a31b8955b7\n(cherry picked from commit 7bd2939d6ce0574f01771b8569b1d76faf2b09b7)\n" }, { "commit": "5e39adb1c42dabd229fa416f4bb484181418e016", "tree": "9ba1df53d19f8daa24e5536b09224dfaa4b76e90", "parents": [ "f12025b61d793a6a16eb5673663a828c2b1e9d0d", "1221fd1704150c76f175afe5bf46436236bdf48b" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Fri Jul 12 23:13:17 2019 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Jul 12 23:13:17 2019 +0000" }, "message": "Merge \"codec2: force array mode for graphic metadata buffers\" into qt-dev" }, { "commit": "f12025b61d793a6a16eb5673663a828c2b1e9d0d", "tree": "d4f838e43e9bcc5fe76bb27fa5912cf97fa109b0", "parents": [ "ace31cd04a8dfc37d488c8118818525ae8a733ed", "1858832f4708285eb5b2ace02d2a580125087d3c" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Fri Jul 12 22:52:17 2019 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Jul 12 22:52:17 2019 +0000" }, "message": "Merge \"Allow creation of input surface in CCodec\" into qt-dev" }, { "commit": "1221fd1704150c76f175afe5bf46436236bdf48b", "tree": "1a899bddc378cacfe99c60b7b9fb04740438f9f9", "parents": [ "c3fa11b6cc0951d21a193be001733b08549415d0" ], "author": { "name": "Wonsik Kim", "email": "wonsik@google.com", "time": "Fri Jul 12 12:52:05 2019 -0700" }, "committer": { "name": "Wonsik Kim", "email": "wonsik@google.com", "time": "Fri Jul 12 12:52:05 2019 -0700" }, "message": "codec2: force array mode for graphic metadata buffers\n\nBug: 133291455\nTest: bug repro steps (10 times)\nChange-Id: I7513a97dcfa50df880539a4a121c697952aae36a\n" }, { "commit": "ace31cd04a8dfc37d488c8118818525ae8a733ed", "tree": "77befd5d2a365b9f0c1d6d542f95e534c38763e8", "parents": [ "20b29ddacc0acc04706882e1b006ad8589c52698", "2cd83c9fbbd286768999ade97f7fce4b409b06c4" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Fri Jul 12 00:39:16 2019 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Jul 12 00:39:16 2019 +0000" }, "message": "Merge \"Skip secure decoders in C2 VTS\" into qt-dev" }, { "commit": "2cd83c9fbbd286768999ade97f7fce4b409b06c4", "tree": "f0f91377c00b51c6fa8f8dabed62055523b318c6", "parents": [ "c3fa11b6cc0951d21a193be001733b08549415d0" ], "author": { "name": "Pawin Vongmasa", "email": "pawin@google.com", "time": "Wed Jul 10 17:50:49 2019 -0700" }, "committer": { "name": "Pawin Vongmasa", "email": "pawin@google.com", "time": "Wed Jul 10 21:35:40 2019 -0700" }, "message": "Skip secure decoders in C2 VTS\n\nTest: vts-tradefed run vts -m VtsHalMediaC2V1_0Host\n\nBug: 136725027\n\nChange-Id: I78e141c04890ab153135a7cc948e2b7dc4897787\n" }, { "commit": "20b29ddacc0acc04706882e1b006ad8589c52698", "tree": "1d4b0a14637e186f2b02dd7a1205cd7a2285b3ea", "parents": [ "c3fa11b6cc0951d21a193be001733b08549415d0" ], "author": { "name": "Wonsik Kim", "email": "wonsik@google.com", "time": "Fri Jun 14 14:40:57 2019 -0700" }, "committer": { "name": "Wonsik Kim", "email": "wonsik@google.com", "time": "Thu Jul 11 00:15:07 2019 +0000" }, "message": "codec2: add color formats for image component\n\nBug: 136731683\nTest: atest CtsMediaTestCases:MediaCodecTest#testPrependHeadersToSyncFrames\nMerged-In: I8233ec928e7c5700abc1bdd7f32e097892947949\nChange-Id: I8233ec928e7c5700abc1bdd7f32e097892947949\n(cherry picked from commit 1622326c3c5ee468cf67b769b13b3dbb3fe9b560)\n" } ], "next": "1858832f4708285eb5b2ace02d2a580125087d3c" }