)]}' { "log": [ { "commit": "6111b2b92a1844f5796c718bf0736102b876c2b9", "tree": "4602e69e50256ce7cc852e840e990ed0b36b9492", "parents": [ "58cc8f2c0254f03d66a28ae1cf0809c171d4ac7d" ], "author": { "name": "James Wei", "email": "jameswei@google.com", "time": "Tue May 28 17:18:21 2019 +0800" }, "committer": { "name": "James Wei", "email": "jameswei@google.com", "time": "Thu Feb 13 14:03:38 2020 +0800" }, "message": "MTP: Sanitize filename provided from MTP host\n\nFix potential security vulnerability via MTP path traversal\n\nBug: 130656917\nTest: atest frameworks/av/media/mtp/tests\nTest: Manual test: modified libmtp for path traversal attack\nTest: Manual test: normal recursive folder copy\nNote: Also patched with 68ccf5c (b/135764253)\nChange-Id: I467e1e6a76d09951050f7f45e5a63419e540c572\n(cherry picked from commit e783e4b24b9e4080e50c50d62a24bcbfabb3e03d)\nMerged-In: I467e1e6a76d09951050f7f45e5a63419e540c572\n" }, { "commit": "58cc8f2c0254f03d66a28ae1cf0809c171d4ac7d", "tree": "4f272e8c6416bac5e87c2633b0d286ffd1c2d24e", "parents": [ "c25b042720672d0943dec638b8287ab80bedbf5d", "cadf7289e0dacf4a40422f0b36f97891649d398b" ], "author": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Feb 13 00:23:52 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Feb 13 00:23:52 2020 +0000" }, "message": "Revert \"BnCrypto: fix use-before-init in CREATE_PLUGIN\" am: e4e7b91ec8 am: 36af5d0319 am: d0d078020e am: e492965229 am: cadf7289e0\n\nChange-Id: I27c1cd22dfa0e5ec371f636ef00e6bd121cc73b7\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": "c25b042720672d0943dec638b8287ab80bedbf5d", "tree": "b7da0afd96c67a66f59ff5e583f7a9f60549ccb2", "parents": [ "20758384397836d1e13bac08da571e07964c088a" ], "author": { "name": "Ytai Ben-Tsvi", "email": "ytai@google.com", "time": "Wed Sep 18 15:24:09 2019 -0700" }, "committer": { "name": "Ytai Ben-Tsvi", "email": "ytai@google.com", "time": "Tue Feb 11 09:41:39 2020 -0800" }, "message": "Protect against TOC/TOU bugs in soundtrigger\n\nTest: Ran the repro program vendor/google_toolbox/user/ytai/SoundTriggerPoc\nTest: Manual verification that soundtrigger still works for hotword and music.\nFixes: 136005905\n\nChange-Id: Icdfe5a823ba02eb7bd8c41f0fa503c9922d8f348\n(cherry picked from commit ea51ad6e1dace60ad68ee84c8d356cf1a17d0efc)\nMerged-In: Icdfe5a823ba02eb7bd8c41f0fa503c9922d8f348\n" }, { "commit": "20758384397836d1e13bac08da571e07964c088a", "tree": "52c0020e3bbed73bf9686306977d6eac9e763a71", "parents": [ "cf24ad44c42d177403b8ecbb880ba54a9326b008", "1142d3ea289b03f2143b789e65fd174ea4854634" ], "author": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Feb 06 20:23:13 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Feb 06 20:23:13 2020 +0000" }, "message": "Merge \"Move implementations to DataSourceBase.h\" into qt-dev am: 1142d3ea28\n\nChange-Id: Iec56bcc48e52c69db03489d4ce683c81113d67b5\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": "cf24ad44c42d177403b8ecbb880ba54a9326b008", "tree": "a1ebab36b864fb496c25eaa589e54edb36b01499", "parents": [ "6302adca26985b22164c6b5d7e59591a47a5572b", "c155398cd771afcc93b7a7acc02946b3596a78e6" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Thu Feb 06 07:02:02 2020 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Feb 06 07:02:02 2020 +0000" }, "message": "Merge \"RESTRICT AUTOMERGE Validate TrackedBuffer in onBufferDestroyed\" into qt-qpr1-dev" }, { "commit": "6302adca26985b22164c6b5d7e59591a47a5572b", "tree": "095e101a529747d0f96580d293168e6a34757817", "parents": [ "92b34e48ba6be4431351618f6409c52e51938545", "66d0e72c9da1d5af852556872262a1e928796389" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Thu Feb 06 02:33:03 2020 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Feb 06 02:33:03 2020 +0000" }, "message": "Merge \"Revert \"audiopolicy: align input and output devices for engine\"\" into qt-qpr1-dev" }, { "commit": "92b34e48ba6be4431351618f6409c52e51938545", "tree": "98a7b0ddc85d5f71ef7d8aa440d34f95da46b737", "parents": [ "7cf46ee5e75bc78fbaa8ec91bfb67d3b5e12019e", "86021896f0811062a47001b20f14bc29badf68e3" ], "author": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Feb 06 00:43:29 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Feb 06 00:43:29 2020 +0000" }, "message": "BnCrypto: fix use-before-init in CREATE_PLUGIN am: 51aa200376 am: aca92198a1 am: f0791037c1 am: df156dc766 am: 86021896f0\n\nChange-Id: Ia97c658b54e517e1bdbd911bba644e458a193e01\n" }, { "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": "7cf46ee5e75bc78fbaa8ec91bfb67d3b5e12019e", "tree": "ac7cfb3e6ad78d9370a0c1855396c5e3b7925c69", "parents": [ "cc8271ea111a2f2119684dafa80247fd45eb4d7a", "0ad729efbbe1951d4bad01eebea3843cb23b0420" ], "author": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Feb 05 23:22:11 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Feb 05 23:22:11 2020 +0000" }, "message": "jailed media processes can dump code coverage data am: 0ad729efbb\n\nChange-Id: I4d57a4438895529ee4fc2fefa4a335a471ae5595\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": "cc8271ea111a2f2119684dafa80247fd45eb4d7a", "tree": "4046c5e8ec58482d193751a0c2eb8326abc165a0", "parents": [ "6e51a2630a656c3f7bb3324f40221970832d8a35" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Mon Oct 14 18:47:34 2019 -0700" }, "committer": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Mon Feb 03 16:58:36 2020 +0000" }, "message": "media utils: fix UAF in TimeCheckThread\n\nRead log tag from request list under lock\nto avoid use after free.\n\nBug: 142142406\nTest: make\nChange-Id: If4adab8c15a319dc84b7003adf3ac59a3980f075\nMerged-In: If4adab8c15a319dc84b7003adf3ac59a3980f075\n(cherry picked from commit 9b9b3de144ce3a145b01a01424b706f69c6d7ed6)\n" }, { "commit": "c155398cd771afcc93b7a7acc02946b3596a78e6", "tree": "e7bf22b4968a2590f39c00c9cd5aacf18e85694d", "parents": [ "6e51a2630a656c3f7bb3324f40221970832d8a35" ], "author": { "name": "Pawin Vongmasa", "email": "pawin@google.com", "time": "Thu Jun 13 18:23:38 2019 +0700" }, "committer": { "name": "Pawin Vongmasa", "email": "pawin@google.com", "time": "Sat Feb 01 05:38:21 2020 +0000" }, "message": "RESTRICT AUTOMERGE Validate TrackedBuffer in onBufferDestroyed\n\nTest: atest CtsMediaTestCases -- \\\n--module-arg CtsMediaTestCases:size:small\n\nBug: 135140854\nChange-Id: Ide95a619305a30b008b1e0bd5010ea2e359f4c99\n(cherry picked from commit 101f53c592f5f6ddd8298ffead3c6533e49ab3c8)\n" }, { "commit": "66d0e72c9da1d5af852556872262a1e928796389", "tree": "3be360927a116b19c19f4ee80f75cdf8af987598", "parents": [ "6e51a2630a656c3f7bb3324f40221970832d8a35" ], "author": { "name": "Kevin Rocard", "email": "krocard@google.com", "time": "Thu Oct 10 10:06:18 2019 +0000" }, "committer": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Sat Feb 01 00:09:55 2020 +0000" }, "message": "Revert \"audiopolicy: align input and output devices for engine\"\n\nThis reverts commit 4b8d5ce58d98d4a163f63e17735450a7cac4821c.\n\nBug: 132241823\nReason for revert: Breaks Screen Mirroring during Live caption\n\nChange-Id: I4bf711e5c5e4233fcf58bda5477380b488fde2fa\n(cherry picked from commit e0d004fe12fc2535d62d52bea0666b690ba057b0)\n" }, { "commit": "6e51a2630a656c3f7bb3324f40221970832d8a35", "tree": "52766e7e3c0f3715fa7d9d9041df2253c71c9a6c", "parents": [ "6e733b0f5032b679e56c37042c3ce8771d9b5f4d" ], "author": { "name": "Pirama Arumuga Nainar", "email": "pirama@google.com", "time": "Tue Jan 28 13:19:02 2020 -0800" }, "committer": { "name": "Pirama Arumuga Nainar", "email": "pirama@google.com", "time": "Tue Jan 28 18:07:15 2020 -0800" }, "message": "Enable coverage for libmediandk\n\nThe linker error previously seen no longer happens - it probably got\nfixed by a non-toolchain-related change since clang-r349610 from Feb\n2019 is able to build libmediandk with coverage in the Q branch.\n\nBug: http://b/124522995\nTest: mmma NATIVE_COVERAGE\u003dtrue frameworks/av/media/ndk and check that\nbuilt libmediandk.so has __gcov_flush symbol\nTest: Presubmit target cf_x86_phone-userdebug_coverage\n\nChange-Id: I24f0c3fbbea733a521ea97e4fe28c94c6f607119\n(cherry picked from commit fec6b9d677ca5fef3413ef10fbb0178e76b37218)\n" }, { "commit": "6e733b0f5032b679e56c37042c3ce8771d9b5f4d", "tree": "8766be1e17957d99c0245873f99f7ae3055aab5d", "parents": [ "d8e73150a6a980cfed9f597033c6e6076055cc76", "a67cf12a109f36152600a621a7c979b4ab273dd9" ], "author": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Jan 23 21:43:12 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Jan 23 21:43:12 2020 +0000" }, "message": "[automerger skipped] Merge \"[DO NOT MERGE] Fix heap buffer overflow in clearkey CryptoPlugin::decrypt\" into pi-dev am: d651cdcfaf -s ours am: a67cf12a10\n\nChange-Id: Icf5ce88a4b654bf3b6886e70069b5725fb946510\n" }, { "commit": "d8e73150a6a980cfed9f597033c6e6076055cc76", "tree": "8766be1e17957d99c0245873f99f7ae3055aab5d", "parents": [ "1a8690374917527eb78993819794d147b98c2963", "5b4757c2bb4359b7272d3bb85e0613d07871ddac" ], "author": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Jan 23 21:42:59 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Jan 23 21:42:59 2020 +0000" }, "message": "Merge \"[DO NOT MERGE] Fix heap buffer overflow in clearkey CryptoPlugin::decrypt\" into qt-dev am: 5b4757c2bb\n\nChange-Id: I0a4c6c46e49781974dd60855c567f5a518767d01\n" }, { "commit": "1a8690374917527eb78993819794d147b98c2963", "tree": "8766be1e17957d99c0245873f99f7ae3055aab5d", "parents": [ "ac8a248341036148913169438fa362afc86cbc08", "d81917505eda818d64135a8226a529b3901dee4b" ], "author": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Jan 23 21:42:42 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Jan 23 21:42:42 2020 +0000" }, "message": "[DO NOT MERGE] Fix heap buffer overflow in clearkey CryptoPlugin::decrypt am: d81917505e\n\nChange-Id: I63c748d094348d9f832706da8002a89e998ad5c2\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": "ac8a248341036148913169438fa362afc86cbc08", "tree": "8766be1e17957d99c0245873f99f7ae3055aab5d", "parents": [ "94ac050b2fd4f4af21003d7bd57c0a572a9afe36", "8464bfa975afe360bb8e3dd59c036ce4a4995fa8" ], "author": { "name": "Edwin Wong", "email": "edwinwong@google.com", "time": "Thu Jan 23 20:59:20 2020 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Jan 23 20:59:20 2020 +0000" }, "message": "Merge \"[DO NOT MERGE] Fix heap buffer overflow in clearkey CryptoPlugin::decrypt\" into qt-qpr1-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": "94ac050b2fd4f4af21003d7bd57c0a572a9afe36", "tree": "602110097b4e474c12c38c6cc635f746219e42e1", "parents": [ "e66902ca77d8fcca83bc05fa56dd34b221bce48b", "63a3347443eeb35d5f73bf13dd882d67c09d03bc" ], "author": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Jan 23 03:34:33 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Jan 23 03:34:33 2020 +0000" }, "message": "[automerger skipped] [DO NOT MERGE] Fix heap buffer overflow for releaseSecureStops. am: 2587ab6c76 -s ours am: 63a3347443\n\nChange-Id: Ia0c1259a0e5e61c2ba4063e5d210e55f8a114adf\n" }, { "commit": "e66902ca77d8fcca83bc05fa56dd34b221bce48b", "tree": "602110097b4e474c12c38c6cc635f746219e42e1", "parents": [ "fa237c4f76b7b9369d9c499bfdc81e5072ddde86", "b92e3bf778ab8dcf28193cfb63c40dd964644c47" ], "author": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Jan 23 03:34:11 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Jan 23 03:34:11 2020 +0000" }, "message": "[automerger skipped] [DO NOT MERGE] Fix heap buffer overflow for releaseSecureStops. am: b92e3bf778 -s ours\nam skip reason: skipped by user edwinwong\n\nChange-Id: I873220bc26a3a88177e072842a63ad170c0ee023\n" }, { "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": "8464bfa975afe360bb8e3dd59c036ce4a4995fa8", "tree": "b7ba24ae51cb89ef4ae31af4bf023315d13b9c0a", "parents": [ "8f72d008d0c51da507fc3c447e68e02b9e2d8535" ], "author": { "name": "Edwin Wong", "email": "edwinwong@google.com", "time": "Tue Dec 17 17:01:59 2019 -0800" }, "committer": { "name": "Edwin Wong", "email": "edwinwong@google.com", "time": "Wed Jan 08 16:02:31 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: Ia1b8f755daaada2f1411abeb3cb5b832a72b3c82\n" }, { "commit": "fa237c4f76b7b9369d9c499bfdc81e5072ddde86", "tree": "602110097b4e474c12c38c6cc635f746219e42e1", "parents": [ "8f72d008d0c51da507fc3c447e68e02b9e2d8535" ], "author": { "name": "Edwin Wong", "email": "edwinwong@google.com", "time": "Wed Nov 27 10:46:17 2019 -0800" }, "committer": { "name": "Edwin Wong", "email": "edwinwong@google.com", "time": "Wed Jan 08 02:32:59 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: Ieccdd86ad86966fbf1dde70d3b3fb73d6dd124a4\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": "8f72d008d0c51da507fc3c447e68e02b9e2d8535", "tree": "0fbe702fc55c1c2aef632dc49386a12608a039ca", "parents": [ "06e89d68d671ee486eeda3ab3bbf064ef21b83ee", "1eba80de4e733a5222459020517ed93327966640" ], "author": { "name": "Bryan Ferris", "email": "bferris@google.com", "time": "Fri Dec 20 20:08:55 2019 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Dec 20 20:08:55 2019 +0000" }, "message": "Merge \"Check actual read bytes for TS packets\" into qt-qpr1-dev" }, { "commit": "06e89d68d671ee486eeda3ab3bbf064ef21b83ee", "tree": "63759671b04edb4e577588e92d84c180d01d234b", "parents": [ "0ec6f56ea142285856dec8ac0ea35f3988621abc", "18824a94a8114661456a103465b291fed336ab39" ], "author": { "name": "Bryan Ferris", "email": "bferris@google.com", "time": "Fri Dec 20 20:08:48 2019 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Dec 20 20:08:48 2019 +0000" }, "message": "Merge \"AudioFlinger: Clear effect_uuid_t in case of short read\" into qt-qpr1-dev" }, { "commit": "18824a94a8114661456a103465b291fed336ab39", "tree": "2a38dd71236c0f41d50e69ebc38d9dbbf0934a74", "parents": [ "9ed54cdf4d8970bdeb88e4488dabb56e1d6c79b7" ], "author": { "name": "Andy Hung", "email": "hunga@google.com", "time": "Wed Aug 21 14:45:41 2019 -0700" }, "committer": { "name": "Bryan Ferris", "email": "bferris@google.com", "time": "Fri Dec 20 11:16:25 2019 -0800" }, "message": "AudioFlinger: Clear effect_uuid_t in case of short read\n\nBug: 139417189\nTest: native test, see bug\nMerged-In: I9ef0e58e2e73089eb9a347d5357e040ac69bbdd1\nChange-Id: I9ef0e58e2e73089eb9a347d5357e040ac69bbdd1\n" }, { "commit": "1eba80de4e733a5222459020517ed93327966640", "tree": "59430bb806951a0ed4f52f63b9ec770c967e35ac", "parents": [ "9ed54cdf4d8970bdeb88e4488dabb56e1d6c79b7" ], "author": { "name": "Chong Zhang", "email": "chz@google.com", "time": "Mon Sep 09 13:20:10 2019 -0700" }, "committer": { "name": "Bryan Ferris", "email": "bferris@google.com", "time": "Fri Dec 20 10:33:53 2019 -0800" }, "message": "Check actual read bytes for TS packets\n\nCheck actual bytes read when feeding the data to TS parser.\n\nBug: 140177694\nTest: poc in bug; StreamingMediaPlayerTest\n\nMerged-In: I4b498fe375af657e17838e5839e6348e1463d559\nChange-Id: I4b498fe375af657e17838e5839e6348e1463d559\n" }, { "commit": "0ec6f56ea142285856dec8ac0ea35f3988621abc", "tree": "39064cf00995a7a1b3777887c2000e923ab24aa5", "parents": [ "3ae43b0ae940eb860fe03a4db6a17fefa155807a" ], "author": { "name": "Edwin Wong", "email": "edwinwong@google.com", "time": "Tue Sep 24 07:31:40 2019 -0700" }, "committer": { "name": "Sterling Huber", "email": "hubers@google.com", "time": "Thu Dec 19 22:10:47 2019 +0000" }, "message": "RESTRICT AUTOMERGE\nHarden Clearkey releaseSecureStops implementation.\n\nPerform more checking for invalid input.\n\nTest: CTS tests\n android.media.cts.MediaDrmClearkeyTest#testSecureStop\n android.media.cts.MediaDrmClearkeyTest\n\nTest: run drmpoc\n no signal 6 on clearkey service after the fix\n\nTest: adb shell ps | grep clearkey\n pid ID does not change after running drmpoc\n\nbug: 137284652\nChange-Id: I971bb33eec6d37ef86fa1a53501c1e6bda50fa3b\n" }, { "commit": "3ae43b0ae940eb860fe03a4db6a17fefa155807a", "tree": "12dd2c6f200e2b03742fc065f297146419e0a89b", "parents": [ "9ed54cdf4d8970bdeb88e4488dabb56e1d6c79b7" ], "author": { "name": "Edwin Wong", "email": "edwinwong@google.com", "time": "Mon Sep 23 13:27:11 2019 -0700" }, "committer": { "name": "Sterling Huber", "email": "hubers@google.com", "time": "Thu Dec 19 22:09:09 2019 +0000" }, "message": "RESTRICT AUTOMERGE\nFix Heap buffer overflow in clearkey releaseSecureStops\n\nSecurity Vulnerability fix: Heap buffer overflow in clearkey\nreleaseSecureStops - android.hardware.drm@1.1-service.clearkey\n\nFix provided by researcher.\n\nTest: CTS tests\n android.media.cts.MediaDrmClearkeyTest#testSecureStop\n android.media.cts.MediaDrmClearkeyTest\n\nTest: run drmpoc\n no signal 6 on clearkey service after the fix\n\nTest: adb shell ps | grep clearkey\n pid ID does not change after running drmpoc\n\nbug: 137284652\nChange-Id: Id085945943aa6b85c597dc8b7c32a3b990c54a2b\n" }, { "commit": "9ed54cdf4d8970bdeb88e4488dabb56e1d6c79b7", "tree": "3d1bf5023ae2611d9600cce550322f92487835af", "parents": [ "a1caf58b779056e0e9993ee0bf2f52dbe18fa347", "221f7b2d2140a49411767b1706eb48037bfada71" ], "author": { "name": "Jayant Chowdhary", "email": "jchowdhary@google.com", "time": "Tue Dec 17 21:07:53 2019 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Dec 17 21:07:53 2019 +0000" }, "message": "Merge \"camera2 ndk: Allow nullptr for ACameraCaptureSession_captureCallbacks.onClosed.\" into qt-qpr1-dev" }, { "commit": "221f7b2d2140a49411767b1706eb48037bfada71", "tree": "b23dd37c758df7c1aae8e07e22cb8d3324e16b1c", "parents": [ "f12b7622412701c4725ed5633972dd53bdd4d3c9" ], "author": { "name": "Jayant Chowdhary", "email": "jchowdhary@google.com", "time": "Wed Aug 14 15:00:24 2019 -0700" }, "committer": { "name": "Jayant Chowdhary", "email": "jchowdhary@google.com", "time": "Mon Dec 16 13:17:17 2019 -0800" }, "message": "camera2 ndk: Allow nullptr for ACameraCaptureSession_captureCallbacks.onClosed.\n\nBug: 134680093\nBug: 146357162\n\nTest: AImageReaderVendorTest\n\nMerged-In: I8d365b434c257e949496d9495d0fa31a18a2e068\nChange-Id: I8d365b434c257e949496d9495d0fa31a18a2e068\nSigned-off-by: Jayant Chowdhary \u003cjchowdhary@google.com\u003e\n(cherry picked from commit 9da975d887ef8d63970e4b11dc9f2c0e0da92705)\n" }, { "commit": "a1caf58b779056e0e9993ee0bf2f52dbe18fa347", "tree": "be833a232df2d53bed2e20e8339db1c495f5aa62", "parents": [ "6a971a6aec6b5b950017dbc90beaad0fd806240b", "f12b7622412701c4725ed5633972dd53bdd4d3c9" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Sat Dec 14 01:59:31 2019 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Sat Dec 14 01:59:31 2019 +0000" }, "message": "Merge \"camera2ndk: ~ACameraCaptureSession shouldn\u0027t hold device lock in ACameraDevice_close().\" into qt-qpr1-dev" }, { "commit": "6a971a6aec6b5b950017dbc90beaad0fd806240b", "tree": "038197bcc6d5505675763c4a41d823f742bfcef4", "parents": [ "9fb726888dda17b68fd924b963d34e6ce9454ba1", "d65084c86d0760afce46cd889b58b3d982088017" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Thu Dec 12 04:10:41 2019 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Dec 12 04:10:41 2019 +0000" }, "message": "Merge \"Camera: Handle onBuffersDiscarded callback\" into qt-qpr1-dev" }, { "commit": "9fb726888dda17b68fd924b963d34e6ce9454ba1", "tree": "bf96e99b9047f37c2a0734cf77ae0c8494615a11", "parents": [ "960bbfab7bd5f2fff6afdecb920f21b8eb3fee45" ], "author": { "name": "Oscar Azucena", "email": "oscarazu@google.com", "time": "Fri Nov 08 18:25:39 2019 -0800" }, "committer": { "name": "Oscar Azucena", "email": "oscarazu@google.com", "time": "Wed Dec 11 21:33:58 2019 +0000" }, "message": "Added usage to init call for audiostream registration.\n\nPlayer type AAudio are always initialized with AUDIO_USAGE_MEDIA. Added\nfix to initialize with assigned usage.\n\nBug: 143578354\nTest: ran native application with usage of AUDIO_USAGE_NOTIFICATION\nTest: atest CtsNativeMediaAAudioTestCases\nChange-Id: I170e0b55d7f90b59d9b5129b22f4a9080957994b\n" }, { "commit": "d65084c86d0760afce46cd889b58b3d982088017", "tree": "d0bcc9d9ad39d899fa60e929e3fc9a7e994369d2", "parents": [ "960bbfab7bd5f2fff6afdecb920f21b8eb3fee45" ], "author": { "name": "Shuzhen Wang", "email": "shuzhenwang@google.com", "time": "Thu Aug 15 09:11:56 2019 -0700" }, "committer": { "name": "Shuzhen Wang", "email": "shuzhenwang@google.com", "time": "Mon Dec 09 22:21:11 2019 +0000" }, "message": "Camera: Handle onBuffersDiscarded callback\n\nUse onBuffersDiscarded callback from buffer queue to invalidate the\nbuffer caches in cameraserver process.\n\nTest: Run testDiscardFreeBuffers, and use trace to profile memory\nBug: 136677409\nBug: 145617243\nChange-Id: Ifac5e852e2a1ac50f5c3f2e047966c59eeb5f1ba\nMerged-In: Ifac5e852e2a1ac50f5c3f2e047966c59eeb5f1ba\n(cherry picked from commit 0160ddd149893fd14c563ac9a124e49443b69fe4)\n" }, { "commit": "f12b7622412701c4725ed5633972dd53bdd4d3c9", "tree": "d4f2eab461cb087a7488e49201294a3c6fdaac0d", "parents": [ "960bbfab7bd5f2fff6afdecb920f21b8eb3fee45" ], "author": { "name": "Jayant Chowdhary", "email": "jchowdhary@google.com", "time": "Thu Sep 26 08:50:17 2019 -0700" }, "committer": { "name": "Jayant Chowdhary", "email": "jchowdhary@google.com", "time": "Mon Dec 09 14:08:59 2019 -0800" }, "message": "camera2ndk: ~ACameraCaptureSession shouldn\u0027t hold device lock in ACameraDevice_close().\n\nWe call disconnectLocked before stopping CameraDevice\u0027s looper, in order to avoid this situation:\n\n1) Its possible that an OnResultReceived callback is received, and posts an\n AMessage with sp\u003cACameraCaptureSession\u003e on CameraDevice\u0027s looper.\n\n2) Before the looper message is processsed, ACameraDevice_close() is\n called by the client, which results in the looper being stopped and\n cleared with device lock held.\n\n3) When the looper is getting cleared, the AMessage containg the\n ACameraCaptureSession pointer is destructed leading to\n ~ACameraCaptureSession running without knowing that the device is\n being closed, as a result it tries to hold device lock, resulting in\n a deadlock.\n\nBug: 141603005\n\nTest: CTS native tests\nTest: use camera2 vndk client for extended periods of time\n\nChange-Id: Ia0d47fc2975981055cd1f2103c1cbe8d76642fe4\nSigned-off-by: Jayant Chowdhary \u003cjchowdhary@google.com\u003e\n(cherry picked from commit a8bf1c6e6d210833070152adf130f4d988fc255e)\n" }, { "commit": "960bbfab7bd5f2fff6afdecb920f21b8eb3fee45", "tree": "6eca1abc80b0d3ea6a0680f45fd0ea28019815f1", "parents": [ "9132522c7e3702227cf65756d11630d51d022f3f" ], "author": { "name": "Emilian Peev", "email": "epeev@google.com", "time": "Wed Oct 30 10:12:46 2019 -0700" }, "committer": { "name": "Emilian Peev", "email": "epeev@google.com", "time": "Tue Nov 19 17:09:42 2019 +0000" }, "message": "Camera: Check consumer interface before disconnecting\n\nThe internal buffer queue and respective \u0027mConsumer\u0027 may\nnever get initialized in case the connection and/or\nconfiguration of client shared output surfaces fails.\nTo avoid possible instabilities check whether the\nconsumer interface is valid before trying to disconnect.\n\nBug: 143506890\nTest: atest\ncts/tests/camera/src/android/hardware/camera2/cts/MultiViewTest.java\n\nChange-Id: Ia533233444fd548ddb52f4fde06212a21bc843bc\nMerged-In: Ia533233444fd548ddb52f4fde06212a21bc843bc\n" }, { "commit": "9132522c7e3702227cf65756d11630d51d022f3f", "tree": "54c5c027de165f212251ef1c341c53a536251072", "parents": [ "40f8906f4561b440cf56596d087b7493282d75e8", "637dad252c7b81b0902f7da922d8134b9cdb673f" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Tue Nov 19 06:47:46 2019 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Nov 19 06:47:46 2019 +0000" }, "message": "Merge \"do not send max pts gap to full-frame image encoders\" into qt-qpr1-dev" }, { "commit": "40f8906f4561b440cf56596d087b7493282d75e8", "tree": "89bef45697dfd51f3a7f9805be7dd203adda09b2", "parents": [ "03dad63123ccd1ac6aa65d657d85fff9527b66eb", "f2ae75ddc535e8ecb253d0b657e597c227057838" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Mon Nov 18 20:34:57 2019 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Nov 18 20:34:57 2019 +0000" }, "message": "Merge changes Iba1c82b0,Ia498f6dd,I16fd11f5 into qt-qpr1-dev\n\n* changes:\n Camera: Heic: Wait for output TS before dequeuing output buffers\n Camera: Heic: Handle out-of-order buffer outputs\n Camera: Heic: Wait for first output tile callback before muxer start\n" }, { "commit": "637dad252c7b81b0902f7da922d8134b9cdb673f", "tree": "5b142b7cd31c5c8b9fef36dbd5a65fd825462114", "parents": [ "03dad63123ccd1ac6aa65d657d85fff9527b66eb" ], "author": { "name": "Chong Zhang", "email": "chz@google.com", "time": "Tue Oct 15 12:34:58 2019 -0700" }, "committer": { "name": "Chong Zhang", "email": "chz@google.com", "time": "Mon Nov 18 17:43:52 2019 +0000" }, "message": "do not send max pts gap to full-frame image encoders\n\nImage encoders don\u0027t use pts for rate control and should take\nbackward pts just fine. Also OMXNodeInstance timestamp restore\nassume one input buffer maps to one output.\n\nbug: 141169323\ntest: vendor testing of Camera CTS\nReprocessCaptureTest-testMixedBurstReprocessing\n\nChange-Id: I17db3b5fb363878c9daf33c914fd2e1e88029cfe\n(cherry picked from commit d372bd43a6c70bd243f34465a5dda42629250fc7)\n" }, { "commit": "03dad63123ccd1ac6aa65d657d85fff9527b66eb", "tree": "19a11645eaa12ad7859604fa4404f51e8ba51f79", "parents": [ "d19313d81544c11f94e54c8211f979ce60214789", "4900ae28b35d301a2baab23d537a4b9344ce0ee6" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Sun Nov 17 12:30:31 2019 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Sun Nov 17 12:30:31 2019 +0000" }, "message": "Merge \"C2SoftMpeg4Enc: Handle yStride not equal to aligned width\" into qt-qpr1-dev" }, { "commit": "4900ae28b35d301a2baab23d537a4b9344ce0ee6", "tree": "9037ce4836e6a916dd8c2b21f979d6fe61d00ce5", "parents": [ "4333c308afa4a695fd8f444d308b794cad656a6e" ], "author": { "name": "Harish Mahendrakar", "email": "harish.mahendrakar@ittiam.com", "time": "Mon Aug 26 16:22:41 2019 -0700" }, "committer": { "name": "Jose Cubero", "email": "josecubero@google.com", "time": "Sat Nov 16 01:35:27 2019 +0000" }, "message": "C2SoftMpeg4Enc: Handle yStride not equal to aligned width\n\nmpeg4 encoder doesn\u0027t support a stride that is not equal to align(width, 16)\nIn such cases copy the input to an intermediate buffer and use that for\nencoding\n\nBug: 143506888\nBug: 136962421\nBug: 139921039\nTest: tested few nv12 and i420 encoding\n\nChange-Id: I5a8adfc48aff79f52852be94bb46c10e7f9a0469\n(cherry picked from commit a6dfef8a44d95f2cc049ee0cb83501605c38ac64)\n" }, { "commit": "d19313d81544c11f94e54c8211f979ce60214789", "tree": "5878c2b857e9ae146d942b61aa708ae3ca9ba8ce", "parents": [ "c4e90131d8cdb2bef34bc1edea784efe36bd3c86" ], "author": { "name": "Wonsik Kim", "email": "wonsik@google.com", "time": "Sun Nov 03 19:05:59 2019 -0800" }, "committer": { "name": "Jose Cubero", "email": "josecubero@google.com", "time": "Thu Nov 14 17:03:49 2019 +0000" }, "message": "vpxdec: handle non-display frames\n\nBug: 143115066\nBug: 144427423\nTest: bug repro steps\nMerged-In: I4c581b229b83a555d6214075f0e5367d17461cc9\nChange-Id: I4c581b229b83a555d6214075f0e5367d17461cc9\n(cherry picked from commit ddd7a80f5bb936f1d4c26f1dcc5e7b4564a26c9e)\n" }, { "commit": "c4e90131d8cdb2bef34bc1edea784efe36bd3c86", "tree": "b36a42baf632c8aecdfc55203b0a384b8cdf83e4", "parents": [ "4333c308afa4a695fd8f444d308b794cad656a6e" ], "author": { "name": "Kevin Rocard", "email": "krocard@google.com", "time": "Wed Sep 18 11:24:52 2019 +0100" }, "committer": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Mon Nov 11 17:10:42 2019 +0000" }, "message": "Fix secondary output under\u0026over run\n\nThere were three issues with the implementation\nof Audio Playback Capture patches on secondary outputs.\n\n1) Patch tracks were always forced to be ready, even if there were not\nenough audio to be played. That led to playing partial buffers if the\nsource output had smaller (time wise) buffer than the secondary output.\n\nThis is fixed by avoiding setting CBLK_FORCEREADY on every buffer push\nfrom the primary output thread.\n\n2) After 1 is fixed, the patch tracks now behave like regular (non fast)\ntracks. This means that the track only starts when it is full.\nThat leads to overrun on startup as the primary and secondary outputs\nusually do not have the same write period.\n\nWhat makes the issue worst is that Remote submix has a fixed buffer in bytes,\nso its write period changes depending on sample rate contrary to the\nprimary HAL which pulls with fixed time periods (usually 20/40ms).\n\nThis patch solution is to introduce a ready threshold. The track will be\nconsidered ready to be active if there are more than frames in its buffer.\n\nTo avoid changing previous latency behaviour except for APC,\nlegacy tracks have this threshold set to their buffer size and\nnon APC patch tracks have it set to 1, similar to setting\nCBLK_FORCEREADY.\n\n3) The patch track buffer size calculation of the patch track did not take\ninto account primary and secondary output could be of different sampling\nrate.\nThis mean that the patch track buffer was usually too small as the\nsecondary output usually had smaller sampling rate (Live caption\nrequests 16kHz) than the track (music usually plays in 48kHz).\nThis made the two problems even worst.\n\nThis was easily fixed by scaling the buffer size with each side sample rate.\n\nBug: 136691300\nTest: play audio\n adb shell audiorecorder --target /data/file1.raw\n # Check that the recorded file has no underrun\nChange-Id: Ib2846b2827afd1b953d4a25acb18c7cadf57cd3e\nSigned-off-by: Kevin Rocard \u003ckrocard@google.com\u003e\n(cherry picked from commit 01c7d9ee1b170a516e20b9c7aad3f9d1db982c55)\n" }, { "commit": "f2ae75ddc535e8ecb253d0b657e597c227057838", "tree": "61c1153d1df097e72171679ce8fb3db1313f5bfe", "parents": [ "0017f0d7714fd06bfbc8faf3039f5fac8c3bdef4" ], "author": { "name": "Michael Gonzalez", "email": "michgonz@codeaurora.org", "time": "Tue Oct 08 14:30:32 2019 -0700" }, "committer": { "name": "Shuzhen Wang", "email": "shuzhenwang@google.com", "time": "Fri Nov 08 18:57:31 2019 +0000" }, "message": "Camera: Heic: Wait for output TS before dequeuing output buffers\n\nDuring testHeicExif, the codec output buffer timestamp may rarely arrive\nafter the first codec output tiles arrive.\n\nTest: vendor testing\nBug: 141169323\nChange-Id: Iba1c82b087533cb87a32d69f7d6908e2c925b807\nMerged-In: Iba1c82b087533cb87a32d69f7d6908e2c925b807\n(cherry picked from commit 5c103f2962cd41a948dca4f2156c6efdf506bef1)\n" }, { "commit": "0017f0d7714fd06bfbc8faf3039f5fac8c3bdef4", "tree": "437279d82780f895267ddf9f7c3ebb79f0067521", "parents": [ "983f81403e9189c52e23f878c6ea5d22e97448e2" ], "author": { "name": "Michael Gonzalez", "email": "michgonz@codeaurora.org", "time": "Wed Oct 09 15:38:17 2019 -0700" }, "committer": { "name": "Shuzhen Wang", "email": "shuzhenwang@google.com", "time": "Fri Nov 08 18:57:02 2019 +0000" }, "message": "Camera: Heic: Handle out-of-order buffer outputs\n\nDuring reprocess usecases, the Camera HAL may return JPEG Appsegment\nframes out of order. This leads to a scenario where\nmAppSegmentConsumer-\u003elockNextBuffer may not refer to the currently muxed\nframe.\n\nTo work around this, the number of lockable appsegment buffers has been\nincreased.\n\nTest: Vendor testing\nBug: 141169323\nChange-Id: Ia498f6ddaba588b66cbaeee94fe8bdd7314bb90c\nMerged-In: Ia498f6ddaba588b66cbaeee94fe8bdd7314bb90c\n(cherry picked from commit b5986a36b2913ec100b110720c3e24e26fd0d1dd)\n" }, { "commit": "983f81403e9189c52e23f878c6ea5d22e97448e2", "tree": "541d7935d24f3855262fe810e557f9b4230bc983", "parents": [ "4333c308afa4a695fd8f444d308b794cad656a6e" ], "author": { "name": "Shuzhen Wang", "email": "shuzhenwang@google.com", "time": "Wed Sep 25 14:19:28 2019 -0700" }, "committer": { "name": "Shuzhen Wang", "email": "shuzhenwang@google.com", "time": "Fri Nov 08 18:54:15 2019 +0000" }, "message": "Camera: Heic: Wait for first output tile callback before muxer start\n\nIn order for muxer to start writing any track, the format returned from\nonFormatChanged must first be available. By waiting for first output\ntile callback, we are guaranteed to have received onFormatChanged, which\nmeans a valid format is available for muxer to use.\n\nThis change also makes it such that no multiple muxers are inflight, avoiding\ndequeueBuffer failure because right now we only support maximum dequeued\nbuffer count to be 1.\n\nAdd more verbose logs for ease of debugging.\n\nTest: Vendor testing\nBug: 141169323\nChange-Id: I16fd11f5558e525ceae59df00533553e4b4e7589\nMerged-In: I16fd11f5558e525ceae59df00533553e4b4e7589\n(cherry picked from commit 3d00ee51a207d15718fcac4fefc72306532d68af)\n" }, { "commit": "4333c308afa4a695fd8f444d308b794cad656a6e", "tree": "03ea093735193b3e347d135c8ae053c3d0e7c0e4", "parents": [ "e50837090728815c38464961d6bcd637bcf1cf0f", "66c527f3c77b1e1f23be0d22cd8c77722a556cb6" ], "author": { "name": "Akshay Thakker", "email": "aksh@google.com", "time": "Thu Nov 07 15:33:44 2019 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Nov 07 15:33:44 2019 +0000" }, "message": "Merge \"DO NOT MERGE Set module versions to 299900000 Dev branch modules need to have a super high version code so that they can be sideloaded on any device running any version of modules.\" into qt-qpr1-dev" }, { "commit": "e50837090728815c38464961d6bcd637bcf1cf0f", "tree": "5621a1739ceb993d0d84baf17cf705e28134751e", "parents": [ "aa700c13def7b34945bc48cd2706707178adbb5a" ], "author": { "name": "Ray Essick", "email": "essick@google.com", "time": "Tue Oct 22 13:33:29 2019 -0700" }, "committer": { "name": "Ray Essick", "email": "essick@google.com", "time": "Fri Nov 01 15:44:54 2019 +0000" }, "message": "g711 channel count limits\n\ncorrect \u0027default to 6 channels\u0027 to \u0027default 1; max 6 channels\u0027\n\nBug: 143163373\nTest: vts-tradefed run vts --module VtsHalMediaC2V1_0Host\n(cherry picked from commit 7a34a8bd9e15ea2b19b08087600bedf6806b8300)\n\nChange-Id: Ifb6aa33f9f277883325f0b233d32aae53a429c5f\n" }, { "commit": "aa700c13def7b34945bc48cd2706707178adbb5a", "tree": "779e020b0fa82283d811cfcfd68e3ba75828fc44", "parents": [ "e3032ea219db3a818c900cef35ce1e2db75cc334", "30dbaa2016dd9a8377f9768d7e86fdcf7e4ebb44" ], "author": { "name": "Sungtak Lee", "email": "taklee@google.com", "time": "Thu Oct 31 23:29:11 2019 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Oct 31 23:29:11 2019 +0000" }, "message": "Merge \"bufferpool@2.0 tune eviction params\" into qt-qpr1-dev" }, { "commit": "e3032ea219db3a818c900cef35ce1e2db75cc334", "tree": "fb3b734416a8ce3a5d4c0b31cf67498cbc791879", "parents": [ "6112a9c691130fd034c5bf46ecda40fcdfd7df04", "5dd3ecb8756a8286eb20029b92b627cd2b3d635f" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Tue Oct 29 20:03:14 2019 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Oct 29 20:03:14 2019 +0000" }, "message": "Merge \"aacenc: fix possible shift in remainder\" into qt-qpr1-dev" }, { "commit": "5dd3ecb8756a8286eb20029b92b627cd2b3d635f", "tree": "609ef7e8047cb4a7ed8361cc69b6257b7655ecd8", "parents": [ "f16f21366cbc91778d3e4c57d0d679dafd274d1f" ], "author": { "name": "Wonsik Kim", "email": "wonsik@google.com", "time": "Wed Oct 23 14:18:39 2019 -0700" }, "committer": { "name": "Wonsik Kim", "email": "wonsik@google.com", "time": "Tue Oct 29 18:35:35 2019 +0000" }, "message": "aacenc: fix possible shift in remainder\n\nBug: 142699551\nTest: modified EncoderTest\nMerged-In: I45f6a0a6666fa6177e0d47931055d2aa3ddd0b3d\nChange-Id: I45f6a0a6666fa6177e0d47931055d2aa3ddd0b3d\n" }, { "commit": "30dbaa2016dd9a8377f9768d7e86fdcf7e4ebb44", "tree": "37e88317766d8904cf59439c4ac8804ee20ef146", "parents": [ "6112a9c691130fd034c5bf46ecda40fcdfd7df04" ], "author": { "name": "Sungtak Lee", "email": "taklee@google.com", "time": "Thu Oct 03 14:38:01 2019 -0700" }, "committer": { "name": "Sungtak Lee", "email": "taklee@google.com", "time": "Tue Oct 29 11:05:12 2019 -0700" }, "message": "bufferpool@2.0 tune eviction params\n\nbufferpool tries to manage memory consumption as low as 15MB usually.\nSince it is too harsh for graphic input buffer use cases, if # of\nbuffers are under certain threshold make bufferpool ignore total memory\nconsumption.\n\nBug: 141605804\nChange-Id: I20bd0438fede018e26984e0e3bc9a2007b0bc29b\n" }, { "commit": "6112a9c691130fd034c5bf46ecda40fcdfd7df04", "tree": "7e784fa63ccc056e4f2e0a1d589dded7e8629cc9", "parents": [ "dac33eaf3984c3f80b51800f0e350bfbded8a1a6", "b7c2cf5d34843dcaf43053acc9da91cccaf122ac" ], "author": { "name": "Jayant Chowdhary", "email": "jchowdhary@google.com", "time": "Mon Oct 28 20:12:01 2019 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Oct 28 20:12:01 2019 +0000" }, "message": "Merge \"cameraserver: Avoiding deadlocks while calling isPublicallyHiddenSecureCamera().\" into qt-qpr1-dev" }, { "commit": "66c527f3c77b1e1f23be0d22cd8c77722a556cb6", "tree": "b5915a18e9cc4d53526b63758b56402c16f9e319", "parents": [ "dac33eaf3984c3f80b51800f0e350bfbded8a1a6" ], "author": { "name": "Akshay", "email": "aksh@google.com", "time": "Fri Oct 25 16:03:53 2019 -0700" }, "committer": { "name": "Akshay Thakker", "email": "aksh@google.com", "time": "Mon Oct 28 17:54:12 2019 +0000" }, "message": "DO NOT MERGE Set module versions to 299900000\nDev branch modules need to have a super high version code so that they can be sideloaded on any device running any version of modules.\n\nBug:143377911\n\nChange-Id: Id4339413ca0a78896392c427d6454c138642f0e7\n" }, { "commit": "dac33eaf3984c3f80b51800f0e350bfbded8a1a6", "tree": "766a4887345278cd52719f8bb8b2d468eca44edc", "parents": [ "f16f21366cbc91778d3e4c57d0d679dafd274d1f", "1e7015ad0f62ca97c3d6f593d33201cf82da1cae" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Fri Oct 25 20:10:40 2019 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Oct 25 20:10:40 2019 +0000" }, "message": "Merge \"Codec2Client: Retry creation on failed transaction\" into qt-qpr1-dev" }, { "commit": "b7c2cf5d34843dcaf43053acc9da91cccaf122ac", "tree": "dbddd7d90ff918a155557baa943d5b1db79cf626", "parents": [ "f16f21366cbc91778d3e4c57d0d679dafd274d1f" ], "author": { "name": "Jayant Chowdhary", "email": "jchowdhary@google.com", "time": "Mon Oct 07 15:26:41 2019 -0700" }, "committer": { "name": "Jayant Chowdhary", "email": "jchowdhary@google.com", "time": "Thu Oct 24 15:51:05 2019 -0700" }, "message": "cameraserver: Avoiding deadlocks while calling isPublicallyHiddenSecureCamera().\n\nThe following scenario can occur:\n\n T1 serving Client A\u0027s disconnect() call:\n T2 : serving Client B\u0027s connect() call\n T2 : CameraProviderManager::openSession() locks mInterfaceMutex and waits on open() HAL\n interface call\n T1: updateStatus() locks mStatusListenerMutex\n T1: CameraProviderManager::isPublicallyHiddenSecureCamera() waits\n on mInterfaceMutex\n T2: while waiting on open(), gets a torchModeStatus() callback from the camera HAL\n T2: onStatusChanged()\n T2: broadcastTorchModeStatus() which waits on mStatusListenerMutex\n\nAs a result there\u0027s a possible circular hold and wait between T1 and T2.\n\nWe cache isPublicallyHiddenSecureCamera in CameraState. That doesn\u0027t completely\navoid having to hold mInterfaceLock while calling isPublicallyHiddenSecureCamera() in CameraService\n(cache updates), instead it reduces it. We instead need to hold mCameraStates lock which has a\nsmaller scope.\n\nBug: 141756275\n\nTest: CTS\nTest: GCA (sanity)\n\nMerged-In: I8562c83478b1fe8fbda7c85f97b995985666918d\nMerged-In: I4a697c1eaccc3603007be4a595febea981fbeb64\nChange-Id: Ie5508afb126a874f76fbbfc2dd19ef79ae6255e0\n(cherry picked from commit fd39db81e44e191baa476a579de6cc2618de025a)\nSigned-off-by: Jayant Chowdhary \u003cjchowdhary@google.com\u003e\n" }, { "commit": "f16f21366cbc91778d3e4c57d0d679dafd274d1f", "tree": "1d8cccdd5a51e06025ec20fe73d0d118254e3260", "parents": [ "1f5583ef37f1b43d470ff9a1ef8b8dc4e0305ca7", "5e4c732e8646ec700b495bc9ca532d92034f44fb" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Wed Oct 23 20:13:32 2019 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Oct 23 20:13:32 2019 +0000" }, "message": "Merge \"Camera: Release all composite streams during \"detachDevice\"\" into qt-qpr1-dev" }, { "commit": "5e4c732e8646ec700b495bc9ca532d92034f44fb", "tree": "bff57382c04a8d040964a8f7d3238c20ebd0eb28", "parents": [ "ca7582109dd529eb80dff3d6135a20950a9e3b47" ], "author": { "name": "Emilian Peev", "email": "epeev@google.com", "time": "Tue Oct 22 14:20:52 2019 -0700" }, "committer": { "name": "Emilian Peev", "email": "epeev@google.com", "time": "Wed Oct 23 09:28:36 2019 -0700" }, "message": "Camera: Release all composite streams during \"detachDevice\"\n\n\"CameraDeviceClient\" which keeps all references to active\ncomposite streams may not get immediately destroyed after\nclient disconnect. This means that all registered output\nsurfaces in composite streams will continue to have\nan active connection. In such scenario camera clients will\nnot be able to re-use the same surface as long as the older\ninstances are still alive.\n Avoid this behavior by explicitly releasing all remaining\ncomposite streams during \"detachDevice\". The method must\nbe called as part of the client disconnect and will\nensure that all surface connections are removed.\n\nBug: 143212133\nTest: Camera CTS\nChange-Id: I08710645539b687f046116a88576f05bbcbdbaff\n" }, { "commit": "1f5583ef37f1b43d470ff9a1ef8b8dc4e0305ca7", "tree": "eb89bf0c356c27b19b6260a147a8eaace0153ed8", "parents": [ "ca7582109dd529eb80dff3d6135a20950a9e3b47" ], "author": { "name": "Wonsik Kim", "email": "wonsik@google.com", "time": "Fri Aug 09 10:35:55 2019 -0700" }, "committer": { "name": "Wonsik Kim", "email": "wonsik@google.com", "time": "Tue Oct 22 20:33:22 2019 +0000" }, "message": "aacenc: handle input size not aligned at sample boundary\n\nBug: 136068046\nBug: 142699551\nTest: modified EncoderTest\nChange-Id: Ife09efcedf573d4327e8482e03dd82fcafdb5eb2\nMerged-In: Ife09efcedf573d4327e8482e03dd82fcafdb5eb2\n(cherry picked from commit 3dd7bd3440ef048fa0fcd9d86c42ac75038e9c11)\n" }, { "commit": "ca7582109dd529eb80dff3d6135a20950a9e3b47", "tree": "5d9a5d5c6e225998ae0a1a05f819e662b567f851", "parents": [ "b5dd7ae0b90cf66e68680c3f8064f78a23675f36", "90a839f6611a7e4ffd6c5af35ba0f16e88b9e2bd" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Fri Oct 11 17:27:11 2019 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Oct 11 17:27:11 2019 +0000" }, "message": "Merge \"Camera: Set input timestamp before returning depth jpegs\" into qt-qpr1-dev" }, { "commit": "1e7015ad0f62ca97c3d6f593d33201cf82da1cae", "tree": "a181d96584a233ce140c5b846028333ef22c6f13", "parents": [ "b5dd7ae0b90cf66e68680c3f8064f78a23675f36" ], "author": { "name": "Pawin Vongmasa", "email": "pawin@google.com", "time": "Wed Oct 09 02:15:50 2019 -0700" }, "committer": { "name": "Pawin Vongmasa", "email": "pawin@google.com", "time": "Wed Oct 09 02:15:50 2019 -0700" }, "message": "Codec2Client: Retry creation on failed transaction\n\nThis CL moves the retrying logic into ForAllStores(). Before the CL,\nCreateInterfaceByName() will fail to detect C2_TRANSACTION_FAILED if the\nlast service that tries to create the component in ForAllStores() does\nnot have the requested component.\n\nTest: atest CtsMediaTestCases -- \\\n--module-arg CtsMediaTestCases:size:small\n\nBug: 141907195\nChange-Id: I98ee084ea14204bba15746e89514636254013aa5\n" }, { "commit": "b5dd7ae0b90cf66e68680c3f8064f78a23675f36", "tree": "90e0f48fde7d3f07367b62be0c2f98527fc327d6", "parents": [ "63b47f918cfe8dc692ada342bec261084d102fcc", "b5a3db3e8ed9adef4fbeb8e3b5e97a1af50bca70" ], "author": { "name": "Jean-Michel Trivi", "email": "jmtrivi@google.com", "time": "Thu Oct 03 15:56:52 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Oct 03 15:56:52 2019 -0700" }, "message": "Merge \"AudioFlinger: enforce OP_RECORD_AUDIO during recording\" into qt-dev am: 7b254210fe\nam: b5a3db3e8e\n\nChange-Id: Iaa9c9a4b8c93143fc4277c673c0e2bbf03d430d7\n" }, { "commit": "b5a3db3e8ed9adef4fbeb8e3b5e97a1af50bca70", "tree": "46515bed0c814d56357b7521fbfe805aecc9a7ac", "parents": [ "678e069993547ee0c0d872d2bf0c19012960b16f", "7b254210fe701b9023d1db342c6d1c884d39efe7" ], "author": { "name": "Jean-Michel Trivi", "email": "jmtrivi@google.com", "time": "Thu Oct 03 15:50:49 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Oct 03 15:50:49 2019 -0700" }, "message": "Merge \"AudioFlinger: enforce OP_RECORD_AUDIO during recording\" into qt-dev\nam: 7b254210fe\n\nChange-Id: I06721afc1c0ac492fc7b1b9efbd4af3758325570\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": "63b47f918cfe8dc692ada342bec261084d102fcc", "tree": "5585c999b04a973ffb8be99243c82ddcf4d8a37b", "parents": [ "16639a6e00d6f0f43486209795011f21ff0dc465", "678e069993547ee0c0d872d2bf0c19012960b16f" ], "author": { "name": "Jean-Michel Trivi", "email": "jmtrivi@google.com", "time": "Thu Oct 03 11:17:31 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Oct 03 11:17:31 2019 -0700" }, "message": "[automerger skipped] Merge \"AudioFlinger: enforce OP_RECORD_AUDIO during recording\" into pi-dev am: 1d2cccfd2a -s ours am: 4a47595ece\nam: 678e069993\n\nChange-Id: Ic61a1c3d97c17a5eaaf07e8343794877815e1914\n" }, { "commit": "678e069993547ee0c0d872d2bf0c19012960b16f", "tree": "cdf211c6f1522b55ff51ec3e006902390af376fd", "parents": [ "9956aa28741e1a01299d3c0eda16c96abe6288d1", "4a47595eceb1da9150e38b02b2e5e79290300a85" ], "author": { "name": "Jean-Michel Trivi", "email": "jmtrivi@google.com", "time": "Thu Oct 03 11:11:05 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Oct 03 11:11:05 2019 -0700" }, "message": "[automerger skipped] Merge \"AudioFlinger: enforce OP_RECORD_AUDIO during recording\" into pi-dev am: 1d2cccfd2a -s ours\nam: 4a47595ece\n\nChange-Id: I8d1c7e85cae5ec229198508240f00165e2b3fb40\n" }, { "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": "90a839f6611a7e4ffd6c5af35ba0f16e88b9e2bd", "tree": "b4a1bc7a283c584bbc0eecdd20176e3ea91aedd9", "parents": [ "16639a6e00d6f0f43486209795011f21ff0dc465" ], "author": { "name": "Emilian Peev", "email": "epeev@google.com", "time": "Wed Oct 02 15:12:50 2019 -0700" }, "committer": { "name": "Emilian Peev", "email": "epeev@google.com", "time": "Wed Oct 02 15:16:45 2019 -0700" }, "message": "Camera: Set input timestamp before returning depth jpegs\n\nThe depth jpeg result and image timestamps must always match.\nSet the depth jpeg output surface timestamp accordingly before\nreturning the resulting output buffer.\n\nBug: 142011420\nTest: atest\ncts/tests/camera/src/android/hardware/camera2/cts/StillCaptureTest.java#testDynamicDepthCapture\n\nChange-Id: I2d70367d3cc60014d24cc138e4ca882b2111e161\n" }, { "commit": "16639a6e00d6f0f43486209795011f21ff0dc465", "tree": "5585c999b04a973ffb8be99243c82ddcf4d8a37b", "parents": [ "863695e7ab51af3db3b97a21de180d3002d85d90", "55badc66542311fe695322fb85dbcfdf23993f20" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Sun Sep 22 11:46:48 2019 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Sun Sep 22 11:46:48 2019 +0000" }, "message": "Merge \"ACodec: read max pts gap and max fps keys for image encoders\" into qt-qpr1-dev" }, { "commit": "863695e7ab51af3db3b97a21de180d3002d85d90", "tree": "35f4beeb0636eb3d462ca0f8409c0ed7e86a40f5", "parents": [ "a11810536889285331a3b82fa202311fd5bf8b8d", "1fa2686026ce128fa16f47fb00f33ecc70ecdb4f" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Sun Sep 22 11:19:04 2019 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Sun Sep 22 11:19:04 2019 +0000" }, "message": "Merge \"Make a copy of output format in onOutputFormatChanged\" into qt-qpr1-dev" }, { "commit": "a11810536889285331a3b82fa202311fd5bf8b8d", "tree": "4c40e322fab6bf959962ad7b966c64b4c26aca49", "parents": [ "eaf3f613a91f4b6383d4c2d81cbedefebef83ec7", "24b44157d3a9736fce60479cbbbabadf53471df0" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Sat Sep 21 00:39:34 2019 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Sat Sep 21 00:39:34 2019 +0000" }, "message": "Merge \"Camera: Delay pingCameraServiceProxy to end of onFirstRef\" into qt-qpr1-dev" }, { "commit": "eaf3f613a91f4b6383d4c2d81cbedefebef83ec7", "tree": "631a02127bfcda3d466a696ba5f13ba74e299f3a", "parents": [ "cf935409652e633096729bdb64029cf2383534e3", "9956aa28741e1a01299d3c0eda16c96abe6288d1" ], "author": { "name": "Ray Essick", "email": "essick@google.com", "time": "Fri Sep 20 13:28:08 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Sep 20 13:28:08 2019 -0700" }, "message": "force g711 test to match 1-channel sample data am: ae55cbf717\nam: 9956aa2874\n\nChange-Id: I32a041f3b2c6e9ea19bc21476fd17353ac235ab9\n" }, { "commit": "9956aa28741e1a01299d3c0eda16c96abe6288d1", "tree": "cdf211c6f1522b55ff51ec3e006902390af376fd", "parents": [ "ef6506d2c5eb9fc71e41e804ebf0e3fb602240eb", "ae55cbf717757115f53b8a9cf71ba76e763599ce" ], "author": { "name": "Ray Essick", "email": "essick@google.com", "time": "Fri Sep 20 13:23:06 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Sep 20 13:23:06 2019 -0700" }, "message": "force g711 test to match 1-channel sample data\nam: ae55cbf717\n\nChange-Id: I27cd320ad4a6ec7eb67842eebce37cfba4cb0274\n" }, { "commit": "1fa2686026ce128fa16f47fb00f33ecc70ecdb4f", "tree": "09afcd977ec8cfbb267ab1820687f2e954bd2978", "parents": [ "804b87d1f80df7b5fbe77e59100c375be1542db7" ], "author": { "name": "Chong Zhang", "email": "chz@google.com", "time": "Mon Sep 16 16:15:00 2019 -0700" }, "committer": { "name": "Chong Zhang", "email": "chz@google.com", "time": "Fri Sep 20 18:21:42 2019 +0000" }, "message": "Make a copy of output format in onOutputFormatChanged\n\nMake a copy of output format in NDK and camera\u0027s heic encoder.\n(MediaCodec.java JNI is already making a copy, so copy out of\nMediaCodec.cpp to avoid unnecessary dup)\n\nbug:141140020\nChange-Id: I8afb1e48b73f0fb2fa584bdee2b93985b48a5e91\n(cherry picked from commit 860eff192e00df5977be5ff8a6fbf3efa6f1f8d5)\n" }, { "commit": "55badc66542311fe695322fb85dbcfdf23993f20", "tree": "a63cabc7c6fbeb12d80c562f0584763d7f73523f", "parents": [ "804b87d1f80df7b5fbe77e59100c375be1542db7" ], "author": { "name": "Chong Zhang", "email": "chz@google.com", "time": "Tue Sep 17 13:20:17 2019 -0700" }, "committer": { "name": "Chong Zhang", "email": "chz@google.com", "time": "Fri Sep 20 11:15:30 2019 -0700" }, "message": "ACodec: read max pts gap and max fps keys for image encoders\n\nThese keys are needed to disable backward frame drops for image\nencoders. They should be read for both video and image types.\n\nbug: 141169323\nChange-Id: I12bea9b25a9902a50ba0e7f7d3f8aa5a497c581c\n(cherry picked from commit 226cedd0ccd3c17c917c951952e278eacd26d7c8)\n" }, { "commit": "24b44157d3a9736fce60479cbbbabadf53471df0", "tree": "4f4e0b6b8941b52fee0ed67d764734d098453d68", "parents": [ "804b87d1f80df7b5fbe77e59100c375be1542db7" ], "author": { "name": "Shuzhen Wang", "email": "shuzhenwang@google.com", "time": "Fri Sep 20 10:38:11 2019 -0700" }, "committer": { "name": "Shuzhen Wang", "email": "shuzhenwang@google.com", "time": "Fri Sep 20 10:48:18 2019 -0700" }, "message": "Camera: Delay pingCameraServiceProxy to end of onFirstRef\n\nThe cameraservice is only registered to service manager after onFirstRef\nis returned. To reduce the probability of getBinderService() call\nreturning null, move pingCameraServiceProxy to end of onFirstRef().\n\nAlso add debug messages in onFirstRef and main() for better diagnoses.\n\nTest: Camera CTS\nBug: 140414594\nChange-Id: I52defd1c138ade57ebc5181c42aff30921fbeaeb\n" }, { "commit": "cf935409652e633096729bdb64029cf2383534e3", "tree": "af977a82797600bc63166e809cd567a21704140a", "parents": [ "804b87d1f80df7b5fbe77e59100c375be1542db7" ], "author": { "name": "Jayant Chowdhary", "email": "jchowdhary@google.com", "time": "Wed Sep 18 20:14:02 2019 -0700" }, "committer": { "name": "Jayant Chowdhary", "email": "jchowdhary@google.com", "time": "Fri Sep 20 10:10:29 2019 -0700" }, "message": "Do not include hidden secure cameras in camera1: getNumberOfCameras\n\nApps cannot connect to hidden secure cameras. Do not include them in the\nnumber of cameras reported by camera1 api.\n\nBug: 141247926\n\nTest: Without CL -\u003e mark all cameras as hidden secure cameras;\n atest FastBasicsTest.java#testCamera1 fails\n With CL -\u003e mark all cameras as hidden secure cameras;\n atest FastBasicsTest.java#testCamera1 passes\n\nTest: camera CTS\n\nMerged-In: I9d1721fd5e94fa7f692c3da52aa667ae9247d368\nChange-Id: I229a336bed6b2695e16c1457cb8f74c26b07f7e8\nSigned-off-by: Jayant Chowdhary \u003cjchowdhary@google.com\u003e\n" }, { "commit": "804b87d1f80df7b5fbe77e59100c375be1542db7", "tree": "7417c1a03cf3f6a8bbf801f8723b254e6bed6529", "parents": [ "727ba2adb29277f3695df03eeefdb25a0508b137", "62cc92bb3801f1181403c78b4f942874050bb874" ], "author": { "name": "Jeffrey Carlyle", "email": "jcarlyle@google.com", "time": "Wed Sep 18 18:14:25 2019 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Sep 18 18:14:25 2019 +0000" }, "message": "Merge \"ServiceUtilities: don\u0027t do RECORD_AUDIO check for system server\" into qt-qpr1-dev" }, { "commit": "727ba2adb29277f3695df03eeefdb25a0508b137", "tree": "97c0288e98d1da246f7315d37fff1f3943a52b21", "parents": [ "611fc70511be8447ebeb1f344f1b04ba6ed5e97a", "447eaf16ad3483a6e95b9a7be7890dbb92a70899" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Wed Sep 18 06:11:03 2019 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Sep 18 06:11:03 2019 +0000" }, "message": "Merge \"MediaCodec: recognize KEY_CAPTURE_RATE\" into qt-qpr1-dev" }, { "commit": "62cc92bb3801f1181403c78b4f942874050bb874", "tree": "5b026f29b960d0ac13cfe7cc2c0fac38891230ab", "parents": [ "1f1b954261e8821a7bf03c25abfd127dcc1f4844" ], "author": { "name": "Jeffrey Carlyle", "email": "jcarlyle@google.com", "time": "Tue Sep 17 11:15:15 2019 -0700" }, "committer": { "name": "Jeffrey Carlyle", "email": "jcarlyle@google.com", "time": "Wed Sep 18 03:30:30 2019 +0000" }, "message": "ServiceUtilities: don\u0027t do RECORD_AUDIO check for system server\n\nOnly one system server seems to exist across multiple-users; however,\nwhen the primary user is backgrounded, system server loses its\nRECORD_AUDIO permission. Through a number of steps this prevents the\nsecondary user from starting any services that use the SoundTrigger HAL;\nspecifically, this was found because it prevents Oslo from functioning\nwhen a secondary user is active.\n\nBug: 139839188\nTest: Oslo use cases pass\nChange-Id: Ia0dd5fd3b6992cb18279b81146b35ed040771245\nSigned-off-by: Jeffrey Carlyle \u003cjcarlyle@google.com\u003e\n" } ], "next": "611fc70511be8447ebeb1f344f1b04ba6ed5e97a" }