)]}' { "log": [ { "commit": "b8f23c5a64b1fef342f2bbba4e88dc56573c94a8", "tree": "af07f3dc60ee3ba094e5cd014e0ff17b2712f3b9", "parents": [ "a4bfdc340a86310d90b237949e2b2648836615cf" ], "author": { "name": "Dichen Zhang", "email": "dichenzhang@google.com", "time": "Mon Mar 22 00:56:29 2021 -0700" }, "committer": { "name": "Dichen Zhang", "email": "dichenzhang@google.com", "time": "Wed Apr 14 22:48:57 2021 +0000" }, "message": "enum migration\n\nMove proto messages out of enum/ directory.\n\nTest: make\nBug: b/184754707\nChange-Id: Ia65cfb5efbc5cee357453bbe7584b6113c402f43\nMerged-In: Ia65cfb5efbc5cee357453bbe7584b6113c402f43\n" }, { "commit": "a4bfdc340a86310d90b237949e2b2648836615cf", "tree": "31c3cff410e0d855b8f033292a7fd4b9cc3adcf6", "parents": [ "afaaf33fde24788efca494e534cf1b4ca4727353", "f8ded31916e891be6d20b3ddc4b38b1eea4249ae" ], "author": { "name": "Santiago Seifert", "email": "aquilescanta@google.com", "time": "Wed Apr 07 12:28:00 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Apr 07 12:28:00 2021 +0000" }, "message": "Merge \"Add some LON team members to OWNERS\" am: abbbb39dca am: 6bed690099 am: f8ded31916\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1526018\n\nChange-Id: Iaddfdb483da676d89d3cda7cf282c6f37f495690\n" }, { "commit": "f8ded31916e891be6d20b3ddc4b38b1eea4249ae", "tree": "d1aaca3974bc8ab7270deed30c4cb74962f3bcbc", "parents": [ "9a2b152afddb42017e26834f097d3498a3ed896b", "6bed690099f3f1a39052327dc49547c313e04268" ], "author": { "name": "Santiago Seifert", "email": "aquilescanta@google.com", "time": "Wed Apr 07 11:40:42 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Apr 07 11:40:42 2021 +0000" }, "message": "Merge \"Add some LON team members to OWNERS\" am: abbbb39dca am: 6bed690099\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1526018\n\nChange-Id: I43b87924e58375af13881137864c0c56209e688e\n" }, { "commit": "6bed690099f3f1a39052327dc49547c313e04268", "tree": "50a4cef3c42f67356c367bf25ed80d329200a4b4", "parents": [ "9dd252709776a1f6e425a8c64bb78a8f3016640e", "abbbb39dca9d3658be15d03fb594a97c5233c93f" ], "author": { "name": "Santiago Seifert", "email": "aquilescanta@google.com", "time": "Wed Apr 07 11:04:40 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Apr 07 11:04:40 2021 +0000" }, "message": "Merge \"Add some LON team members to OWNERS\" am: abbbb39dca\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1526018\n\nChange-Id: Ib3f466c69d0df794c8b0ec81b1e541ea43412b15\n" }, { "commit": "abbbb39dca9d3658be15d03fb594a97c5233c93f", "tree": "50a4cef3c42f67356c367bf25ed80d329200a4b4", "parents": [ "5b68d9c182af29adf441639cdde555adbd68cbd6", "c44b356a3a21270b1d29a4a9d2bffdecbcb951bd" ], "author": { "name": "Santiago Seifert", "email": "aquilescanta@google.com", "time": "Wed Apr 07 10:20:35 2021 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Wed Apr 07 10:20:35 2021 +0000" }, "message": "Merge \"Add some LON team members to OWNERS\"" }, { "commit": "afaaf33fde24788efca494e534cf1b4ca4727353", "tree": "43c095d04841b933038dd332cc3dd10df77804d4", "parents": [ "dd2ce45926e20f0ea1245de075c1773788bcdf63", "58a8737c2638afc8c6a131c8ee2b6ff6af0f7c13" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Wed Apr 07 04:11:32 2021 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Apr 07 04:11:32 2021 +0000" }, "message": "Merge \"aaudio test: test hang in error callback\" into sc-dev" }, { "commit": "dd2ce45926e20f0ea1245de075c1773788bcdf63", "tree": "39be8014750a061fe28927bb2a1b7d252e11520d", "parents": [ "e1e347b2d27d35fa6721c02b72e7264280263ce4", "5ff3b953112ccb7414d99f501e349d4d795d746a" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Wed Apr 07 04:11:32 2021 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Apr 07 04:11:32 2021 +0000" }, "message": "Merge \"aaudio: check for callback thread outside the lock\" into sc-dev" }, { "commit": "e1e347b2d27d35fa6721c02b72e7264280263ce4", "tree": "fadad376d9d33438b65f809ef3dd5cfc8be34450", "parents": [ "a49373f3bbe85a584f60f2bce11b626aca3e1abf", "9a2b152afddb42017e26834f097d3498a3ed896b" ], "author": { "name": "Edwin Wong", "email": "edwinwong@google.com", "time": "Wed Apr 07 01:19:25 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Apr 07 01:19:25 2021 +0000" }, "message": "[automerger skipped] Merge \"[RESTRICT AUTOMERGE] Fix clearkey CryptoPlugin use after free vulnerability.\" into qt-dev am: a791711394 am: bdd6f616f0 -s ours am: 534493a522 am: c87f6bb276 am: 9a2b152afd -s ours\n\nam skip reason: subject contains skip directive\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/13499528\n\nChange-Id: Icf974417246210d709951209e913c15873893909\n" }, { "commit": "a49373f3bbe85a584f60f2bce11b626aca3e1abf", "tree": "fadad376d9d33438b65f809ef3dd5cfc8be34450", "parents": [ "a1952145f72892a4792c1c28059773795a1079b6", "30f378553067fbc79b582bb77927c0f3899cce57" ], "author": { "name": "Edwin Wong", "email": "edwinwong@google.com", "time": "Wed Apr 07 01:19:23 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Apr 07 01:19:23 2021 +0000" }, "message": "[automerger skipped] [RESTRICT AUTOMERGE] Fix clearkey CryptoPlugin use after free vulnerability. am: abb7ad47b0 am: 2e056f1923 -s ours am: 6fc9c6ed98 am: bb15caf7f9 am: 30f3785530 -s ours\n\nam skip reason: subject contains skip directive\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/13499528\n\nChange-Id: I771c1bd7223e229b63e2f30a0451378801d8eb1a\n" }, { "commit": "a1952145f72892a4792c1c28059773795a1079b6", "tree": "fadad376d9d33438b65f809ef3dd5cfc8be34450", "parents": [ "c1d928bcaf38a31e49eca816b06bcecc2598f9cf", "4449e397484d73ab3c2945075bc010d0a1278a0f" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Wed Apr 07 00:48:52 2021 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Apr 07 00:48:52 2021 +0000" }, "message": "Merge \"AppendData:MPEG4Writer\u0026Extractor,MediaAppender\" into sc-dev" }, { "commit": "c1d928bcaf38a31e49eca816b06bcecc2598f9cf", "tree": "7bd5319b4908ad94a81ec8f85a5dfa21112e5875", "parents": [ "9259b8f4dded9e17c8ea00698c557f6a7c520a90", "0b5d7ce5fc1cef48641bad63e0e4ec5525669972" ], "author": { "name": "Edwin Wong", "email": "edwinwong@google.com", "time": "Wed Apr 07 00:36:49 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Apr 07 00:36:49 2021 +0000" }, "message": "[automerger skipped] Merge \"[RESTRICT AUTOMERGE] Fix clearkey CryptoPlugin use after free vulnerability.\" into qt-dev am: a791711394 am: bdd6f616f0 -s ours am: 534493a522 am: 0b5d7ce5fc -s ours\n\nam skip reason: subject contains skip directive\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/13499528\n\nChange-Id: I2c28a1a9706c4ee33ce73257ef27b1e00802806a\n" }, { "commit": "9259b8f4dded9e17c8ea00698c557f6a7c520a90", "tree": "7bd5319b4908ad94a81ec8f85a5dfa21112e5875", "parents": [ "e3c9d97d6f5fa5abfba26fc90d9c30f9481457d6", "36ce0ecd311bdb37d350fe55d0dac9f7edabe525" ], "author": { "name": "Edwin Wong", "email": "edwinwong@google.com", "time": "Wed Apr 07 00:36:48 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Apr 07 00:36:48 2021 +0000" }, "message": "[automerger skipped] [RESTRICT AUTOMERGE] Fix clearkey CryptoPlugin use after free vulnerability. am: abb7ad47b0 am: 2e056f1923 -s ours am: 6fc9c6ed98 am: 36ce0ecd31 -s ours\n\nam skip reason: subject contains skip directive\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/13499528\n\nChange-Id: Ia83c517e49f2540a81d8b7c6c67bb806e4d275d2\n" }, { "commit": "9a2b152afddb42017e26834f097d3498a3ed896b", "tree": "73ceee1e2c4e78cda906f77f5a6e2517755d2022", "parents": [ "30f378553067fbc79b582bb77927c0f3899cce57", "c87f6bb2765000ad9af4e1f250f48c9f969509d5" ], "author": { "name": "Edwin Wong", "email": "edwinwong@google.com", "time": "Wed Apr 07 00:32:25 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Apr 07 00:32:25 2021 +0000" }, "message": "[automerger skipped] Merge \"[RESTRICT AUTOMERGE] Fix clearkey CryptoPlugin use after free vulnerability.\" into qt-dev am: a791711394 am: bdd6f616f0 -s ours am: 534493a522 am: c87f6bb276\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/13499528\n\nChange-Id: Iad9fb7d7fc02629894a35b914363c3a890ace48b\n" }, { "commit": "30f378553067fbc79b582bb77927c0f3899cce57", "tree": "73ceee1e2c4e78cda906f77f5a6e2517755d2022", "parents": [ "5c1026b4dac648f869a43e2e0f6e7828f53781d8", "bb15caf7f9ac40158390679cac0473c489228fb2" ], "author": { "name": "Edwin Wong", "email": "edwinwong@google.com", "time": "Wed Apr 07 00:32:23 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Apr 07 00:32:23 2021 +0000" }, "message": "[automerger skipped] [RESTRICT AUTOMERGE] Fix clearkey CryptoPlugin use after free vulnerability. am: abb7ad47b0 am: 2e056f1923 -s ours am: 6fc9c6ed98 am: bb15caf7f9\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/13499528\n\nChange-Id: Ia308c643333073aa8ce0deea772e139a0098de26\n" }, { "commit": "0b5d7ce5fc1cef48641bad63e0e4ec5525669972", "tree": "3e552a4a18440cca2091f67c1a52f24c51a3a2bc", "parents": [ "36ce0ecd311bdb37d350fe55d0dac9f7edabe525", "534493a522c2f86720f2e74c6fb40d408b3f4ac2" ], "author": { "name": "Edwin Wong", "email": "edwinwong@google.com", "time": "Tue Apr 06 23:52:20 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Apr 06 23:52:20 2021 +0000" }, "message": "[automerger skipped] Merge \"[RESTRICT AUTOMERGE] Fix clearkey CryptoPlugin use after free vulnerability.\" into qt-dev am: a791711394 am: bdd6f616f0 -s ours am: 534493a522\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/13499528\n\nChange-Id: I16f05719c7197917709316eecdd54b1ad77049f9\n" }, { "commit": "36ce0ecd311bdb37d350fe55d0dac9f7edabe525", "tree": "3e552a4a18440cca2091f67c1a52f24c51a3a2bc", "parents": [ "388207ec29feebd31bbc2faeb8c439210b178865", "6fc9c6ed980d9b698e3c0e9334ac8b9d76cd4582" ], "author": { "name": "Edwin Wong", "email": "edwinwong@google.com", "time": "Tue Apr 06 23:52:20 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Apr 06 23:52:20 2021 +0000" }, "message": "[automerger skipped] [RESTRICT AUTOMERGE] Fix clearkey CryptoPlugin use after free vulnerability. am: abb7ad47b0 am: 2e056f1923 -s ours am: 6fc9c6ed98\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/13499528\n\nChange-Id: I8ad263011c0d5819869ca33ade69f36ac3957a66\n" }, { "commit": "c87f6bb2765000ad9af4e1f250f48c9f969509d5", "tree": "f93e421e2d80c8984953d319ceb530ccc44598dd", "parents": [ "bb15caf7f9ac40158390679cac0473c489228fb2", "534493a522c2f86720f2e74c6fb40d408b3f4ac2" ], "author": { "name": "Edwin Wong", "email": "edwinwong@google.com", "time": "Tue Apr 06 23:47:33 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Apr 06 23:47:33 2021 +0000" }, "message": "[automerger skipped] Merge \"[RESTRICT AUTOMERGE] Fix clearkey CryptoPlugin use after free vulnerability.\" into qt-dev am: a791711394 am: bdd6f616f0 -s ours am: 534493a522\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/13499528\n\nChange-Id: Iff46b81afa2298dca7068e1d9cd041d36e30fc81\n" }, { "commit": "bb15caf7f9ac40158390679cac0473c489228fb2", "tree": "f93e421e2d80c8984953d319ceb530ccc44598dd", "parents": [ "c5dc2536b9af56b347c6f9d3977e27e4900f5c49", "6fc9c6ed980d9b698e3c0e9334ac8b9d76cd4582" ], "author": { "name": "Edwin Wong", "email": "edwinwong@google.com", "time": "Tue Apr 06 23:47:32 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Apr 06 23:47:32 2021 +0000" }, "message": "[automerger skipped] [RESTRICT AUTOMERGE] Fix clearkey CryptoPlugin use after free vulnerability. am: abb7ad47b0 am: 2e056f1923 -s ours am: 6fc9c6ed98\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/13499528\n\nChange-Id: I509890052f364e25d596853d9db7f45c5c5e6f18\n" }, { "commit": "e3c9d97d6f5fa5abfba26fc90d9c30f9481457d6", "tree": "7bd5319b4908ad94a81ec8f85a5dfa21112e5875", "parents": [ "994744c582259931ab8580e9173dc058ec041642", "5c1026b4dac648f869a43e2e0f6e7828f53781d8" ], "author": { "name": "Jayant Chowdhary", "email": "jchowdhary@google.com", "time": "Tue Apr 06 23:33:01 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Apr 06 23:33:01 2021 +0000" }, "message": "[automerger skipped] Merge \"cameraserver: Enforce system camera rules for setTorchMode and torch callbacks.\" am: 5b68d9c182 am: 9dd2527097 -s ours am: 5c1026b4da -s ours\n\nam skip reason: skip tag Change-Id Ic849aa91e4d953f45ed99efae997e45671d116b3 with SHA-1 aa6e3ea942 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1658768\n\nChange-Id: If720778c23577549c688b6fc1fd4d4c781faee32\n" }, { "commit": "534493a522c2f86720f2e74c6fb40d408b3f4ac2", "tree": "50303b322a7d9be89082121eaced4017600cc6b3", "parents": [ "6fc9c6ed980d9b698e3c0e9334ac8b9d76cd4582", "bdd6f616f08724542b6c0a66d854affa58788b33" ], "author": { "name": "Edwin Wong", "email": "edwinwong@google.com", "time": "Tue Apr 06 23:27:22 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Apr 06 23:27:22 2021 +0000" }, "message": "[automerger skipped] Merge \"[RESTRICT AUTOMERGE] Fix clearkey CryptoPlugin use after free vulnerability.\" into qt-dev am: a791711394 am: bdd6f616f0 -s ours\n\nam skip reason: subject contains skip directive\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/13499528\n\nChange-Id: Ie66a1d09f6bd587d7698b77ae487e784f3d90cc4\n" }, { "commit": "6fc9c6ed980d9b698e3c0e9334ac8b9d76cd4582", "tree": "50303b322a7d9be89082121eaced4017600cc6b3", "parents": [ "79a6ffbdaf14cfbb597efd8545ba401f1da28a4f", "2e056f192323f4f8c71582c4b4c51bc44f80c2a3" ], "author": { "name": "Edwin Wong", "email": "edwinwong@google.com", "time": "Tue Apr 06 23:27:19 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Apr 06 23:27:19 2021 +0000" }, "message": "[automerger skipped] [RESTRICT AUTOMERGE] Fix clearkey CryptoPlugin use after free vulnerability. am: abb7ad47b0 am: 2e056f1923 -s ours\n\nam skip reason: subject contains skip directive\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/13499528\n\nChange-Id: I1eca94fe9a0491c44bc4a5314f8d5283076fb292\n" }, { "commit": "5c1026b4dac648f869a43e2e0f6e7828f53781d8", "tree": "73ceee1e2c4e78cda906f77f5a6e2517755d2022", "parents": [ "effa2b511fdff55842f00db3f26398f6cc2fbb79", "9dd252709776a1f6e425a8c64bb78a8f3016640e" ], "author": { "name": "Jayant Chowdhary", "email": "jchowdhary@google.com", "time": "Tue Apr 06 23:07:47 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Apr 06 23:07:47 2021 +0000" }, "message": "[automerger skipped] Merge \"cameraserver: Enforce system camera rules for setTorchMode and torch callbacks.\" am: 5b68d9c182 am: 9dd2527097 -s ours\n\nam skip reason: skip tag Change-Id Ic849aa91e4d953f45ed99efae997e45671d116b3 with SHA-1 aa6e3ea942 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1658768\n\nChange-Id: Icde6fb781d64939de59ad68b597a1e925bec6803\n" }, { "commit": "bdd6f616f08724542b6c0a66d854affa58788b33", "tree": "886346c1448e64e59aca38dffd74f1e247f6d3ce", "parents": [ "2e056f192323f4f8c71582c4b4c51bc44f80c2a3", "a79171139422e3f6001c9a8cda06de9f565d8251" ], "author": { "name": "Edwin Wong", "email": "edwinwong@google.com", "time": "Tue Apr 06 23:06:30 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Apr 06 23:06:30 2021 +0000" }, "message": "Merge \"[RESTRICT AUTOMERGE] Fix clearkey CryptoPlugin use after free vulnerability.\" into qt-dev am: a791711394\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/13499528\n\nChange-Id: Ib8db65b4c136ea80aa5761ab0137e96ed551e687\n" }, { "commit": "2e056f192323f4f8c71582c4b4c51bc44f80c2a3", "tree": "886346c1448e64e59aca38dffd74f1e247f6d3ce", "parents": [ "8e3741aac87ecd2ca4bf43bcc6095d2c4a0fdf03", "abb7ad47b00ae158eded8813801345d91d2b2671" ], "author": { "name": "Edwin Wong", "email": "edwinwong@google.com", "time": "Tue Apr 06 23:06:28 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Apr 06 23:06:28 2021 +0000" }, "message": "[RESTRICT AUTOMERGE] Fix clearkey CryptoPlugin use after free vulnerability. am: abb7ad47b0\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/13499528\n\nChange-Id: I6d702cef4ea2063a4e3d57213c8d2ec36bacd7e9\n" }, { "commit": "58a8737c2638afc8c6a131c8ee2b6ff6af0f7c13", "tree": "8b02f20ed930782d120e6829d09b73ca765857cd", "parents": [ "6134b84b26ea7071891f5b38fd2783f6c227b7e6" ], "author": { "name": "Phil Burk", "email": "philburk@google.com", "time": "Fri Apr 02 00:07:34 2021 +0000" }, "committer": { "name": "Phil Burk", "email": "philburk@google.com", "time": "Tue Apr 06 23:06:24 2021 +0000" }, "message": "aaudio test: test hang in error callback\n\nCall illegal functions that should return an error\nbut can hang if a race condition is forced.\n\nThis test also verifies that the error callback\nis not running after the close() is finished.\n\nBug: 184370309\nTest: Manual test. Enter:\nTest: adb shell test_disconnect_race\nTest: Then plug/unplug headphones as directed.\n\nChange-Id: I75f2d94329cd1b29cc3e6d275907172a7d7ac592\n" }, { "commit": "994744c582259931ab8580e9173dc058ec041642", "tree": "7bd5319b4908ad94a81ec8f85a5dfa21112e5875", "parents": [ "8ae3c375d77f42b06cac5d219284dbb482d7b900", "effa2b511fdff55842f00db3f26398f6cc2fbb79" ], "author": { "name": "Edwin Wong", "email": "edwinwong@google.com", "time": "Tue Apr 06 22:49:36 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Apr 06 22:49:36 2021 +0000" }, "message": "[automerger skipped] [RESTRICT AUTOMERGE]Fix CryptoPlugin use after free vulnerability. am: 79a6ffbdaf am: c5dc2536b9 am: effa2b511f -s ours\n\nam skip reason: subject contains skip directive\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/13808809\n\nChange-Id: Ie7dcd3ce7ef7dca2805f109c7a4b3e034263b2e9\n" }, { "commit": "a79171139422e3f6001c9a8cda06de9f565d8251", "tree": "925ca89dd166eb730c15449d4681b7d1ba041e7d", "parents": [ "2a41846f89b9890b93eb4cc501f55a7b315cd58a", "abb7ad47b00ae158eded8813801345d91d2b2671" ], "author": { "name": "Edwin Wong", "email": "edwinwong@google.com", "time": "Tue Apr 06 22:27:14 2021 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Apr 06 22:27:14 2021 +0000" }, "message": "Merge \"[RESTRICT AUTOMERGE] Fix clearkey CryptoPlugin use after free vulnerability.\" into qt-dev" }, { "commit": "8ae3c375d77f42b06cac5d219284dbb482d7b900", "tree": "7bd5319b4908ad94a81ec8f85a5dfa21112e5875", "parents": [ "2d22d571d8083f5c4b68ff3752613e8c631b9996", "388207ec29feebd31bbc2faeb8c439210b178865" ], "author": { "name": "Edwin Wong", "email": "edwinwong@google.com", "time": "Tue Apr 06 22:27:00 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Apr 06 22:27:00 2021 +0000" }, "message": "[automerger skipped] [RESTRICT AUTOMERGE]Fix CryptoPlugin use after free vulnerability. am: 79a6ffbdaf am: 388207ec29 -s ours\n\nam skip reason: subject contains skip directive\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/13808809\n\nChange-Id: I85776ac0668035a8d66ecdf95cd3760d19dd2438\n" }, { "commit": "9dd252709776a1f6e425a8c64bb78a8f3016640e", "tree": "f530e905beec077e77d6cc9c959e361505f88437", "parents": [ "7278e4d2019fd86eec90461d9854021749f35af2", "5b68d9c182af29adf441639cdde555adbd68cbd6" ], "author": { "name": "Jayant Chowdhary", "email": "jchowdhary@google.com", "time": "Tue Apr 06 22:24:10 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Apr 06 22:24:10 2021 +0000" }, "message": "Merge \"cameraserver: Enforce system camera rules for setTorchMode and torch callbacks.\" am: 5b68d9c182\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1658768\n\nChange-Id: I98d57c122f7446d9555c143174e9b390ac67687c\n" }, { "commit": "effa2b511fdff55842f00db3f26398f6cc2fbb79", "tree": "73ceee1e2c4e78cda906f77f5a6e2517755d2022", "parents": [ "9ea359b3ddf6a64b5180d9e93a309beab931724a", "c5dc2536b9af56b347c6f9d3977e27e4900f5c49" ], "author": { "name": "Edwin Wong", "email": "edwinwong@google.com", "time": "Tue Apr 06 22:23:03 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Apr 06 22:23:03 2021 +0000" }, "message": "[RESTRICT AUTOMERGE]Fix CryptoPlugin use after free vulnerability. am: 79a6ffbdaf am: c5dc2536b9\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/13808809\n\nChange-Id: Ie68d50b9eed47edf8f6baa8fd2086defc8c10622\n" }, { "commit": "2d22d571d8083f5c4b68ff3752613e8c631b9996", "tree": "7bd5319b4908ad94a81ec8f85a5dfa21112e5875", "parents": [ "38a0290ce0f04e47fc29e042f104bb3534e847db", "b6e26f61a9888161db7c7c995657af845df86ee3" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Tue Apr 06 22:06:28 2021 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Apr 06 22:06:28 2021 +0000" }, "message": "Merge \"audiopolicy: reflect libbinder/am split\" into sc-dev" }, { "commit": "388207ec29feebd31bbc2faeb8c439210b178865", "tree": "3e552a4a18440cca2091f67c1a52f24c51a3a2bc", "parents": [ "dcd633403bc83907fe069b9e66612be5e922d372", "79a6ffbdaf14cfbb597efd8545ba401f1da28a4f" ], "author": { "name": "Edwin Wong", "email": "edwinwong@google.com", "time": "Tue Apr 06 21:53:48 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Apr 06 21:53:48 2021 +0000" }, "message": "[RESTRICT AUTOMERGE]Fix CryptoPlugin use after free vulnerability. am: 79a6ffbdaf\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/13808809\n\nChange-Id: I08795c8b298eff0e67281e73d4a13fe5693b0a11\n" }, { "commit": "c5dc2536b9af56b347c6f9d3977e27e4900f5c49", "tree": "f93e421e2d80c8984953d319ceb530ccc44598dd", "parents": [ "2e13f4a3ec5fa24dd1efdad97efa1b2216f3cf22", "79a6ffbdaf14cfbb597efd8545ba401f1da28a4f" ], "author": { "name": "Edwin Wong", "email": "edwinwong@google.com", "time": "Tue Apr 06 21:49:14 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Apr 06 21:49:14 2021 +0000" }, "message": "[RESTRICT AUTOMERGE]Fix CryptoPlugin use after free vulnerability. am: 79a6ffbdaf\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/13808809\n\nChange-Id: I05e0d7f0260cb4686e7333d1cf8f9afa440b23a0\n" }, { "commit": "5b68d9c182af29adf441639cdde555adbd68cbd6", "tree": "f530e905beec077e77d6cc9c959e361505f88437", "parents": [ "8d22b0941104d31a99aa602e040ec185a88cad60", "64d907aa80a5af9e82f0c48cca5dd9952137b41c" ], "author": { "name": "Jayant Chowdhary", "email": "jchowdhary@google.com", "time": "Tue Apr 06 21:24:12 2021 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Tue Apr 06 21:24:12 2021 +0000" }, "message": "Merge \"cameraserver: Enforce system camera rules for setTorchMode and torch callbacks.\"" }, { "commit": "64d907aa80a5af9e82f0c48cca5dd9952137b41c", "tree": "05ea5d7cc12a59ad2bd248d7e95c7a66d9a4efa7", "parents": [ "cd2b79a8d7962fa754c0387990c9ff67fa201350" ], "author": { "name": "Jayant Chowdhary", "email": "jchowdhary@google.com", "time": "Wed Mar 31 02:13:46 2021 -0700" }, "committer": { "name": "Jayant Chowdhary", "email": "jchowdhary@google.com", "time": "Tue Apr 06 20:10:39 2021 +0000" }, "message": "cameraserver: Enforce system camera rules for setTorchMode and torch callbacks.\n\nBug: 182530469\n\nTest: Make Emulator back camera system camera; FlashTest.java\n\nMerged-In: Ic849aa91e4d953f45ed99efae997e45671d116b3\nChange-Id: Ic849aa91e4d953f45ed99efae997e45671d116b3\nSigned-off-by: Jayant Chowdhary \u003cjchowdhary@google.com\u003e\n(cherry picked from commit 8c62d8985c8a9f34c65bf0927a41ab1d9543c366)\n" }, { "commit": "38a0290ce0f04e47fc29e042f104bb3534e847db", "tree": "d15b53357970c26f959bad10337963d0fe14a03f", "parents": [ "ca772ce4e563bdd63b4865ad7230f9bb03842876", "9ea359b3ddf6a64b5180d9e93a309beab931724a" ], "author": { "name": "Andy Hung", "email": "hunga@google.com", "time": "Tue Apr 06 16:55:31 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Apr 06 16:55:31 2021 +0000" }, "message": "Merge \"libeffects: Clamp output after Treble biquad\" am: 8d22b09411 am: 7278e4d201 am: 9ea359b3dd\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1652257\n\nChange-Id: Ib7347165fc46d2a2870a4c289cd6c3ba71f0c5f8\n" }, { "commit": "ca772ce4e563bdd63b4865ad7230f9bb03842876", "tree": "d4ebaffdbb2ffc5d08f0a7745fcbd4ff5dcc7593", "parents": [ "503df7d712f686051c7095e07e959d372181b868", "364e6e0a63ea91a8a1cb9cc01966c9a200d601fc" ], "author": { "name": "Edwin Wong", "email": "edwinwong@google.com", "time": "Tue Apr 06 16:54:46 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Apr 06 16:54:46 2021 +0000" }, "message": "[automerger skipped] Merge \"Fix possible uaf of play policy state\" into qt-dev am: 2a41846f89 am: 8e3741aac8 -s ours am: 9a4d85f6bd -s ours am: 2e13f4a3ec -s ours am: 364e6e0a63 -s ours\n\nam skip reason: skip tag Change-Id I07cc93c255942d56e866d0b08fb786f154f6e0d3 with SHA-1 2c075c71a3 is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/13486147\n\nChange-Id: I93a70a5853852af27840c523c3ca7aeb35d2934b\n" }, { "commit": "503df7d712f686051c7095e07e959d372181b868", "tree": "d4ebaffdbb2ffc5d08f0a7745fcbd4ff5dcc7593", "parents": [ "3341f5df4dc1ce001cbf9bf5d33629e86f2e017c", "b443912bc12d400abc36514929c1f9a61e6377e0" ], "author": { "name": "Edwin Wong", "email": "edwinwong@google.com", "time": "Tue Apr 06 16:54:36 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Apr 06 16:54:36 2021 +0000" }, "message": "[automerger skipped] Merge \"Fix potential decrypt destPtr overflow.\" into rvc-dev am: 5b3fc84035 am: 97a19d9428 am: b443912bc1 -s ours\n\nam skip reason: skipped by user edwinwong\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/13467358\n\nChange-Id: I2dd0e83a94295e4d5ab0a56302f547ee9ef65b97\n" }, { "commit": "79a6ffbdaf14cfbb597efd8545ba401f1da28a4f", "tree": "50303b322a7d9be89082121eaced4017600cc6b3", "parents": [ "9a4d85f6bdb10303d3ea8e1c80ee0024ae97f972" ], "author": { "name": "Edwin Wong", "email": "edwinwong@google.com", "time": "Fri Jan 22 20:38:33 2021 -0800" }, "committer": { "name": "Edwin Wong", "email": "edwinwong@google.com", "time": "Mon Apr 05 23:20:45 2021 -0700" }, "message": "[RESTRICT AUTOMERGE]Fix CryptoPlugin use after free vulnerability.\n\nThe shared memory buffer used by srcPtr can be freed by another\nthread because it is not protected by a mutex. Subsequently,\na use after free AIGABRT can occur in a race condition.\n\nSafetyNet logging is not added to avoid log spamming. The\nmutex lock is called to setup for decryption, which is\ncalled frequently.\n\nThe crash was reproduced on the device before the fix.\nVerified the test passes after the fix.\n\nTest: sts\n sts-tradefed run sts-engbuild-no-spl-lock -m StsHostTestCases --test android.security.sts.Bug_176495665#testPocBug_176495665\n\nTest: push to device with target_hwasan-userdebug build\n adb shell /data/local/tmp/Bug-176495665_sts64\n\nBug: 176495665\nBug: 176444161\nChange-Id: I3bfe5c34acb41608d1250a075984ab7860076331\n" }, { "commit": "9ea359b3ddf6a64b5180d9e93a309beab931724a", "tree": "7f3066cb90059da727d0bd284b54c043c821a655", "parents": [ "364e6e0a63ea91a8a1cb9cc01966c9a200d601fc", "7278e4d2019fd86eec90461d9854021749f35af2" ], "author": { "name": "Andy Hung", "email": "hunga@google.com", "time": "Tue Apr 06 06:05:30 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Apr 06 06:05:30 2021 +0000" }, "message": "Merge \"libeffects: Clamp output after Treble biquad\" am: 8d22b09411 am: 7278e4d201\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1652257\n\nChange-Id: I45678a6fb774525d46a24125bf8895add2a92f93\n" }, { "commit": "7278e4d2019fd86eec90461d9854021749f35af2", "tree": "9db32df2f2e2f5bd1421f092349a84f5a14edb21", "parents": [ "e138f3304b0db77c01a84264b8ec795bf280213c", "8d22b0941104d31a99aa602e040ec185a88cad60" ], "author": { "name": "Andy Hung", "email": "hunga@google.com", "time": "Tue Apr 06 05:24:30 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Apr 06 05:24:30 2021 +0000" }, "message": "Merge \"libeffects: Clamp output after Treble biquad\" am: 8d22b09411\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1652257\n\nChange-Id: Ia9c6cd722bb6ccf170486b67824599f665f45e45\n" }, { "commit": "3341f5df4dc1ce001cbf9bf5d33629e86f2e017c", "tree": "d4ebaffdbb2ffc5d08f0a7745fcbd4ff5dcc7593", "parents": [ "6fa04c1b20c6d6fb4f8cfd502fd40b5cc7a83341", "dcd633403bc83907fe069b9e66612be5e922d372" ], "author": { "name": "Edwin Wong", "email": "edwinwong@google.com", "time": "Tue Apr 06 05:07:33 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Apr 06 05:07:33 2021 +0000" }, "message": "[automerger skipped] Merge \"Fix possible uaf of play policy state\" into qt-dev am: 2a41846f89 am: 8e3741aac8 -s ours am: 9a4d85f6bd -s ours am: dcd633403b -s ours\n\nam skip reason: skip tag Change-Id I07cc93c255942d56e866d0b08fb786f154f6e0d3 with SHA-1 2c075c71a3 is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/13486147\n\nChange-Id: I28d5b7ac091d27a7eb6d94def061fd017d76eef3\n" }, { "commit": "8d22b0941104d31a99aa602e040ec185a88cad60", "tree": "9db32df2f2e2f5bd1421f092349a84f5a14edb21", "parents": [ "925338f63fce136e0cb26a49365d6553b3a5df67", "c25affd2e7fcadc8164a8b1bdfc1d1acbabf845a" ], "author": { "name": "Andy Hung", "email": "hunga@google.com", "time": "Tue Apr 06 04:42:15 2021 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Tue Apr 06 04:42:15 2021 +0000" }, "message": "Merge \"libeffects: Clamp output after Treble biquad\"" }, { "commit": "364e6e0a63ea91a8a1cb9cc01966c9a200d601fc", "tree": "4c431eef534c1f0857be635ee8711217eca74608", "parents": [ "b443912bc12d400abc36514929c1f9a61e6377e0", "2e13f4a3ec5fa24dd1efdad97efa1b2216f3cf22" ], "author": { "name": "Edwin Wong", "email": "edwinwong@google.com", "time": "Tue Apr 06 00:00:29 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Apr 06 00:00:29 2021 +0000" }, "message": "[automerger skipped] Merge \"Fix possible uaf of play policy state\" into qt-dev am: 2a41846f89 am: 8e3741aac8 -s ours am: 9a4d85f6bd -s ours am: 2e13f4a3ec -s ours\n\nam skip reason: skip tag Change-Id I07cc93c255942d56e866d0b08fb786f154f6e0d3 with SHA-1 e07417a9b7 is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/13486147\n\nChange-Id: I8e6a132e67d5ab203926f561b692ba6974fa269f\n" }, { "commit": "dcd633403bc83907fe069b9e66612be5e922d372", "tree": "a57e6a56a229e027b1a0b6989be5ebe9e6c4daa6", "parents": [ "0ef6e5e619a675a28d70dbf3dd420a3dcbebcabf", "9a4d85f6bdb10303d3ea8e1c80ee0024ae97f972" ], "author": { "name": "Edwin Wong", "email": "edwinwong@google.com", "time": "Mon Apr 05 23:23:50 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Apr 05 23:23:50 2021 +0000" }, "message": "[automerger skipped] Merge \"Fix possible uaf of play policy state\" into qt-dev am: 2a41846f89 am: 8e3741aac8 -s ours am: 9a4d85f6bd -s ours\n\nam skip reason: skip tag Change-Id I07cc93c255942d56e866d0b08fb786f154f6e0d3 with SHA-1 e07417a9b7 is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/13486147\n\nChange-Id: Ica9a65594c39f5d6b383ad8dcc6660c442043140\n" }, { "commit": "2e13f4a3ec5fa24dd1efdad97efa1b2216f3cf22", "tree": "5dc33909de5a521dc088f5fab42100d148a913e0", "parents": [ "97a19d9428be4bf63d3e99eaa6f19ea0af4530f2", "9a4d85f6bdb10303d3ea8e1c80ee0024ae97f972" ], "author": { "name": "Edwin Wong", "email": "edwinwong@google.com", "time": "Mon Apr 05 23:19:01 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Apr 05 23:19:01 2021 +0000" }, "message": "[automerger skipped] Merge \"Fix possible uaf of play policy state\" into qt-dev am: 2a41846f89 am: 8e3741aac8 -s ours am: 9a4d85f6bd -s ours\n\nam skip reason: skip tag Change-Id I07cc93c255942d56e866d0b08fb786f154f6e0d3 with SHA-1 e07417a9b7 is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/13486147\n\nChange-Id: I61793d04496a299273a7be864a4827f252794132\n" }, { "commit": "6fa04c1b20c6d6fb4f8cfd502fd40b5cc7a83341", "tree": "d4ebaffdbb2ffc5d08f0a7745fcbd4ff5dcc7593", "parents": [ "4a6f306323bb04849df513dd7eac64323b31dffa", "0ef6e5e619a675a28d70dbf3dd420a3dcbebcabf" ], "author": { "name": "Edwin Wong", "email": "edwinwong@google.com", "time": "Mon Apr 05 22:54:29 2021 +0000" }, "committer": { "name": "Edwin Wong", "email": "edwinwong@google.com", "time": "Mon Apr 05 22:56:53 2021 +0000" }, "message": "resolve merge conflicts of 0ef6e5e619a675a28d70dbf3dd420a3dcbebcabf to sc-dev\n\nFix potential decrypt destPtr overflow.\n\nThere is a potential integer overflow to bypass the\ndestination base size check in decrypt. The destPtr\ncan then point to the outside of the destination buffer.\n\nTest: sts-tradefed\n sts-tradefed run sts-engbuild-no-spl-lock -m StsHostTestCases --test android.security.sts.Bug_176444622#testPocBug_176444622\n\nTest: push to device with target_hwasan-userdebug build\n adb shell /data/local/tmp/Bug-17644462264\n\nBug: 176444622\nBug: 176496353\nChange-Id: I9f0b5e1e74271b7133ab674b37c35cefffe03077\n" }, { "commit": "b6e26f61a9888161db7c7c995657af845df86ee3", "tree": "d9f56e4898c031e8f3791e7c68d9735c312a882c", "parents": [ "0b6816f2448f1d2568409b26ff105c8608383485" ], "author": { "name": "Steven Moreland", "email": "smoreland@google.com", "time": "Mon Apr 05 22:05:06 2021 +0000" }, "committer": { "name": "Steven Moreland", "email": "smoreland@google.com", "time": "Mon Apr 05 22:39:01 2021 +0000" }, "message": "audiopolicy: reflect libbinder/am split\n\nSplitting out extra classes from libbinder so that it takes less memory\nto use (many processes don\u0027t use activity manager). Currently, this\nlibrary is empty, and this CL is being merged to add the dependency\nbefore activity manager code is moved into this library, because this\nfile was only converted to Android.bp on internal branches.\n\nBug: 183654927\nTest: N/A\nChange-Id: Idd20f64a2bb54c1364aa996d6e4ec4fe9e27d732\n" }, { "commit": "b443912bc12d400abc36514929c1f9a61e6377e0", "tree": "4c431eef534c1f0857be635ee8711217eca74608", "parents": [ "584d88207991b95e5d7c6031ccc6f2adc030a2dc", "97a19d9428be4bf63d3e99eaa6f19ea0af4530f2" ], "author": { "name": "Edwin Wong", "email": "edwinwong@google.com", "time": "Mon Apr 05 22:37:14 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Apr 05 22:37:14 2021 +0000" }, "message": "Merge \"Fix potential decrypt destPtr overflow.\" into rvc-dev am: 5b3fc84035 am: 97a19d9428\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/13467358\n\nChange-Id: Iec5367892aea18977667fd6e317675cd2bdebb48\n" }, { "commit": "9a4d85f6bdb10303d3ea8e1c80ee0024ae97f972", "tree": "5751496f5a326dc9be04a5d89a079d95f5b9400d", "parents": [ "5b3fc84035a7e521135e85fd1764452a0eae1e8e", "8e3741aac87ecd2ca4bf43bcc6095d2c4a0fdf03" ], "author": { "name": "Edwin Wong", "email": "edwinwong@google.com", "time": "Mon Apr 05 22:37:07 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Apr 05 22:37:07 2021 +0000" }, "message": "[automerger skipped] Merge \"Fix possible uaf of play policy state\" into qt-dev am: 2a41846f89 am: 8e3741aac8 -s ours\n\nam skip reason: skip tag Change-Id I07cc93c255942d56e866d0b08fb786f154f6e0d3 with SHA-1 e07417a9b7 is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/13486147\n\nChange-Id: Id12483ad9ae84e6aaab7c75f3652534fd3051cba\n" }, { "commit": "0ef6e5e619a675a28d70dbf3dd420a3dcbebcabf", "tree": "a57e6a56a229e027b1a0b6989be5ebe9e6c4daa6", "parents": [ "56af5904c128b2e41f4bc95948e3e1137c43a537", "5b3fc84035a7e521135e85fd1764452a0eae1e8e" ], "author": { "name": "Edwin Wong", "email": "edwinwong@google.com", "time": "Mon Apr 05 22:01:23 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Apr 05 22:01:23 2021 +0000" }, "message": "Merge \"Fix potential decrypt destPtr overflow.\" into rvc-dev am: 5b3fc84035\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/13467358\n\nChange-Id: If6f6cc6798f4cdcd59b65442f98eedf0607c61c1\n" }, { "commit": "97a19d9428be4bf63d3e99eaa6f19ea0af4530f2", "tree": "5dc33909de5a521dc088f5fab42100d148a913e0", "parents": [ "48132b70ae8a4d366a95d11cfe3549a5f6485698", "5b3fc84035a7e521135e85fd1764452a0eae1e8e" ], "author": { "name": "Edwin Wong", "email": "edwinwong@google.com", "time": "Mon Apr 05 21:56:38 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Apr 05 21:56:38 2021 +0000" }, "message": "Merge \"Fix potential decrypt destPtr overflow.\" into rvc-dev am: 5b3fc84035\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/13467358\n\nChange-Id: Icdd26d85132711d859d328a0eb7334d7daa8dbe3\n" }, { "commit": "8e3741aac87ecd2ca4bf43bcc6095d2c4a0fdf03", "tree": "16ddf56c96d014368bcd87fa08bfd1c822fcd316", "parents": [ "b68392b02eb378e033913cf76ddc6e5ccc31a1de", "2a41846f89b9890b93eb4cc501f55a7b315cd58a" ], "author": { "name": "Edwin Wong", "email": "edwinwong@google.com", "time": "Mon Apr 05 21:56:30 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Apr 05 21:56:30 2021 +0000" }, "message": "Merge \"Fix possible uaf of play policy state\" into qt-dev am: 2a41846f89\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/13486147\n\nChange-Id: Id454c425990a2a0913a1ee6dadc052fbae405482\n" }, { "commit": "4a6f306323bb04849df513dd7eac64323b31dffa", "tree": "c0ac13869eac73085305d409eae8e32fa14250d1", "parents": [ "edb048c1b82080a2af8ee59a8afc5f3875dfa42e", "584d88207991b95e5d7c6031ccc6f2adc030a2dc" ], "author": { "name": "Andy Hung", "email": "hunga@google.com", "time": "Mon Apr 05 21:40:06 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Apr 05 21:40:06 2021 +0000" }, "message": "Merge \"libeffects: Test treble module with treble level\" am: 925338f63f am: e138f3304b am: 584d882079\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1653832\n\nChange-Id: I7fc26aa1900a9198a32b36faca0dcb880ae3c218\n" }, { "commit": "5b3fc84035a7e521135e85fd1764452a0eae1e8e", "tree": "5751496f5a326dc9be04a5d89a079d95f5b9400d", "parents": [ "78cc1229099782c4f70a0bf3b1de61aa8c368398", "49c0fe413ceb2e0cef356d2738d63bb873845e04" ], "author": { "name": "Edwin Wong", "email": "edwinwong@google.com", "time": "Mon Apr 05 21:22:06 2021 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Apr 05 21:22:06 2021 +0000" }, "message": "Merge \"Fix potential decrypt destPtr overflow.\" into rvc-dev" }, { "commit": "2a41846f89b9890b93eb4cc501f55a7b315cd58a", "tree": "3b7d2c55bf74b09469307310d876baa373bc18f7", "parents": [ "6889557362e8d542c99d4138fa0c0a98e8ffb9a7", "3c73391f6e8c4d28f4ed3d1fc7379acdebaa6fa6" ], "author": { "name": "Edwin Wong", "email": "edwinwong@google.com", "time": "Mon Apr 05 21:15:32 2021 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Apr 05 21:15:32 2021 +0000" }, "message": "Merge \"Fix possible uaf of play policy state\" into qt-dev" }, { "commit": "edb048c1b82080a2af8ee59a8afc5f3875dfa42e", "tree": "36e5390f468d9b12d37b0798f6049bfcb606c011", "parents": [ "3f819d4a0a61c93834b22058a67e1528894ca7aa", "2c075c71a3c70f8eaa00f2f5b395a981141b2041" ], "author": { "name": "Edwin Wong", "email": "edwinwong@google.com", "time": "Mon Apr 05 21:15:32 2021 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Apr 05 21:15:32 2021 +0000" }, "message": "Merge \"Fix possible uaf of play policy state\" into sc-dev" }, { "commit": "3f819d4a0a61c93834b22058a67e1528894ca7aa", "tree": "e084a65c602b3773b22dc5f89541c66c850db296", "parents": [ "139633dff0c02b2a12d6d0ebf218ebe0d219290f", "240279ecd56717350e597a21987a772c3e88ccbc" ], "author": { "name": "Edwin Wong", "email": "edwinwong@google.com", "time": "Mon Apr 05 20:47:48 2021 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Apr 05 20:47:48 2021 +0000" }, "message": "Merge \"[RESTRICT AUTOMERGE] Fix CryptoPlugin use after free vulnerability.\" into sc-dev" }, { "commit": "584d88207991b95e5d7c6031ccc6f2adc030a2dc", "tree": "2a25556e21809070d3c17fc8a317181b71cb80df", "parents": [ "145a4ce212bb94c95cb11d3e0877698008f4470e", "e138f3304b0db77c01a84264b8ec795bf280213c" ], "author": { "name": "Andy Hung", "email": "hunga@google.com", "time": "Mon Apr 05 20:47:39 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Apr 05 20:47:39 2021 +0000" }, "message": "Merge \"libeffects: Test treble module with treble level\" am: 925338f63f am: e138f3304b\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1653832\n\nChange-Id: Id09d98e4b556f1bbcde5f20f31f212717e016176\n" }, { "commit": "e138f3304b0db77c01a84264b8ec795bf280213c", "tree": "68f4e293fb4281541ea7cd15b02f7c5bb7ec1ea9", "parents": [ "2e0f85065a07399d7d1618c8e38993d6a7adb311", "925338f63fce136e0cb26a49365d6553b3a5df67" ], "author": { "name": "Andy Hung", "email": "hunga@google.com", "time": "Mon Apr 05 20:06:05 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Apr 05 20:06:05 2021 +0000" }, "message": "Merge \"libeffects: Test treble module with treble level\" am: 925338f63f\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1653832\n\nChange-Id: Ic4594468ce353ed7b3191f54c3d3240472e1b453\n" }, { "commit": "925338f63fce136e0cb26a49365d6553b3a5df67", "tree": "68f4e293fb4281541ea7cd15b02f7c5bb7ec1ea9", "parents": [ "9575a041659e69d660fdcc6d3ea2792802724b8c", "b4245ceaa07d04186079f07b341fd10915854364" ], "author": { "name": "Andy Hung", "email": "hunga@google.com", "time": "Mon Apr 05 19:30:43 2021 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Mon Apr 05 19:30:43 2021 +0000" }, "message": "Merge \"libeffects: Test treble module with treble level\"" }, { "commit": "139633dff0c02b2a12d6d0ebf218ebe0d219290f", "tree": "fce8d3fa7a26d67ae3d8e905ff5ff08c13bffe33", "parents": [ "b4f43f16473da540b834ea393bb1481590febf5f", "145a4ce212bb94c95cb11d3e0877698008f4470e" ], "author": { "name": "Jayant Chowdhary", "email": "jchowdhary@google.com", "time": "Sat Apr 03 07:12:28 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Sat Apr 03 07:12:28 2021 +0000" }, "message": "[automerger skipped] Merge \"cameraserver: Enforce system camera rules for setTorchMode and torch callbacks.\" into rvc-qpr-dev am: 48132b70ae am: 145a4ce212 -s ours\n\nam skip reason: skip tag Change-Id Ic849aa91e4d953f45ed99efae997e45671d116b3 with SHA-1 8c62d8985c is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/14068897\n\nChange-Id: I8d5ab7a32dad3b229242a6964a207dedb5c10613\n" }, { "commit": "145a4ce212bb94c95cb11d3e0877698008f4470e", "tree": "73c923bddbe92b1d1b6fe3e1b682e7d16968bba8", "parents": [ "a1204833e945a66d60be3d78f4d833be822dd919", "48132b70ae8a4d366a95d11cfe3549a5f6485698" ], "author": { "name": "Jayant Chowdhary", "email": "jchowdhary@google.com", "time": "Sat Apr 03 06:30:22 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Sat Apr 03 06:30:22 2021 +0000" }, "message": "Merge \"cameraserver: Enforce system camera rules for setTorchMode and torch callbacks.\" into rvc-qpr-dev am: 48132b70ae\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/14068897\n\nChange-Id: Id5b253682258fb03dca6f38190809096e5dc337f\n" }, { "commit": "48132b70ae8a4d366a95d11cfe3549a5f6485698", "tree": "c97f9c6115074291fa699476dbe9ff208363eca7", "parents": [ "1bedb86ac7a37d063d7c92d954aeffbaa8ee29f4", "aa6e3ea942a24da1e74461779705c49852ac11e4" ], "author": { "name": "Jayant Chowdhary", "email": "jchowdhary@google.com", "time": "Sat Apr 03 05:50:07 2021 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Sat Apr 03 05:50:07 2021 +0000" }, "message": "Merge \"cameraserver: Enforce system camera rules for setTorchMode and torch callbacks.\" into rvc-qpr-dev" }, { "commit": "b4f43f16473da540b834ea393bb1481590febf5f", "tree": "fce8d3fa7a26d67ae3d8e905ff5ff08c13bffe33", "parents": [ "48500fe6a5c96456fc605ec43fffd0d146a0108c", "e44bfa3a4b770d7835aa4ac3b8948cb8ea61a743" ], "author": { "name": "Brian Lindahl", "email": "blindahl@google.com", "time": "Sat Apr 03 04:42:42 2021 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Sat Apr 03 04:42:42 2021 +0000" }, "message": "Merge \"Record MediaCodec video playback duration\" into sc-dev" }, { "commit": "48500fe6a5c96456fc605ec43fffd0d146a0108c", "tree": "f96e28470058f6b726e48d508e362766a47bd394", "parents": [ "57ad83312dcbb2df832b7b728b17ceed8c3eccb8", "a1204833e945a66d60be3d78f4d833be822dd919" ], "author": { "name": "Steven Moreland", "email": "smoreland@google.com", "time": "Sat Apr 03 01:20:24 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Sat Apr 03 01:20:24 2021 +0000" }, "message": "Merge \"libbinder - split out I?ProcessInfoService\" am: 9575a04165 am: 2e0f85065a am: a1204833e9\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1662931\n\nChange-Id: Iecb896eee14ae361ddfec151bafef948b14d5b26\n" }, { "commit": "a1204833e945a66d60be3d78f4d833be822dd919", "tree": "dbd0bd9be25e3f10f3f65993f6411f7036d6fbff", "parents": [ "5747c1fea5848efe26bf94da89f1ae391b793283", "2e0f85065a07399d7d1618c8e38993d6a7adb311" ], "author": { "name": "Steven Moreland", "email": "smoreland@google.com", "time": "Sat Apr 03 00:35:06 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Sat Apr 03 00:35:06 2021 +0000" }, "message": "Merge \"libbinder - split out I?ProcessInfoService\" am: 9575a04165 am: 2e0f85065a\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1662931\n\nChange-Id: Iba14f475a0bfc7d8bc1abe97d1d0aea77799e6e4\n" }, { "commit": "2e0f85065a07399d7d1618c8e38993d6a7adb311", "tree": "d3536c78656c165c487fc47b863818e2b0ef7cc3", "parents": [ "5f16bac96ede2ab6f127bd342a5b46539ec3ef1e", "9575a041659e69d660fdcc6d3ea2792802724b8c" ], "author": { "name": "Steven Moreland", "email": "smoreland@google.com", "time": "Sat Apr 03 00:01:13 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Sat Apr 03 00:01:13 2021 +0000" }, "message": "Merge \"libbinder - split out I?ProcessInfoService\" am: 9575a04165\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1662931\n\nChange-Id: I5673c9a1cc314d96e0fdf0f2a5385a72fac4935f\n" }, { "commit": "57ad83312dcbb2df832b7b728b17ceed8c3eccb8", "tree": "d10718de548c8e43971753876c587731106eaf5f", "parents": [ "e77325796f7c36192014d32df2ab3a3ae1203855", "5747c1fea5848efe26bf94da89f1ae391b793283" ], "author": { "name": "Edwin Wong", "email": "edwinwong@google.com", "time": "Sat Apr 03 00:01:04 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Sat Apr 03 00:01:04 2021 +0000" }, "message": "[automerger skipped] Merge \"[RESTRICT AUTOMERGE] Fix UAF in clearkey service\u0027s MemoryFileSystem\" into qt-dev am: 6889557362 am: b68392b02e -s ours am: 78cc122909 am: 1bedb86ac7 am: 5747c1fea5 -s ours\n\nam skip reason: subject contains skip directive\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/13711823\n\nChange-Id: I769357595e54e1a3c8c45c0aa7dd8427189bce4a\n" }, { "commit": "e77325796f7c36192014d32df2ab3a3ae1203855", "tree": "d10718de548c8e43971753876c587731106eaf5f", "parents": [ "b71bc8db1523a5d492000298d05014a580f07748", "ea7e6b49c9035ea7cb6fe77704956a2c4fb417dc" ], "author": { "name": "Edwin Wong", "email": "edwinwong@google.com", "time": "Sat Apr 03 00:01:03 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Sat Apr 03 00:01:03 2021 +0000" }, "message": "[automerger skipped] [RESTRICT AUTOMERGE] Fix UAF in clearkey service\u0027s MemoryFileSystem am: 9ba33b3586 -s ours am: 0a2abba43f -s ours am: a4e3bea9e4 am: 0245e885d3 am: ea7e6b49c9 -s ours\n\nam skip reason: subject contains skip directive\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/13711823\n\nChange-Id: Ifb018971f35898215072af617670adacb36b6ad0\n" }, { "commit": "9575a041659e69d660fdcc6d3ea2792802724b8c", "tree": "d3536c78656c165c487fc47b863818e2b0ef7cc3", "parents": [ "66547278fcb2b2dcdfd7969503560294fdc6d15f", "886d7327a3b5a9f3e0c4002e5c3f8c05e2556bf0" ], "author": { "name": "Steven Moreland", "email": "smoreland@google.com", "time": "Fri Apr 02 23:15:50 2021 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Fri Apr 02 23:15:50 2021 +0000" }, "message": "Merge \"libbinder - split out I?ProcessInfoService\"" }, { "commit": "b71bc8db1523a5d492000298d05014a580f07748", "tree": "d10718de548c8e43971753876c587731106eaf5f", "parents": [ "8b77104cac0930c3ce8188faa997a41078cde6ba", "56af5904c128b2e41f4bc95948e3e1137c43a537" ], "author": { "name": "Edwin Wong", "email": "edwinwong@google.com", "time": "Fri Apr 02 23:15:08 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Apr 02 23:15:08 2021 +0000" }, "message": "[automerger skipped] Merge \"[RESTRICT AUTOMERGE] Fix UAF in clearkey service\u0027s MemoryFileSystem\" into qt-dev am: 6889557362 am: b68392b02e -s ours am: 78cc122909 am: 56af5904c1 -s ours\n\nam skip reason: subject contains skip directive\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/13711823\n\nChange-Id: Iecdf09a330672181dd3c94e1522036df84e4ea7d\n" }, { "commit": "8b77104cac0930c3ce8188faa997a41078cde6ba", "tree": "d10718de548c8e43971753876c587731106eaf5f", "parents": [ "e0d2fe2eea201f30437686a2af741c4ef3ca9a1f", "cc0a8fc9729631c411cc5c02ec6902f0ea2891df" ], "author": { "name": "Edwin Wong", "email": "edwinwong@google.com", "time": "Fri Apr 02 23:15:07 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Apr 02 23:15:07 2021 +0000" }, "message": "[automerger skipped] [RESTRICT AUTOMERGE] Fix UAF in clearkey service\u0027s MemoryFileSystem am: 9ba33b3586 -s ours am: 0a2abba43f -s ours am: a4e3bea9e4 am: cc0a8fc972 -s ours\n\nam skip reason: subject contains skip directive\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/13711823\n\nChange-Id: I90ca35cdddd2d809d6a6f64cf64b562fe843fd15\n" }, { "commit": "5747c1fea5848efe26bf94da89f1ae391b793283", "tree": "be93d04da0a741711fba9dcd9f347a8a09a2b432", "parents": [ "ea7e6b49c9035ea7cb6fe77704956a2c4fb417dc", "1bedb86ac7a37d063d7c92d954aeffbaa8ee29f4" ], "author": { "name": "Edwin Wong", "email": "edwinwong@google.com", "time": "Fri Apr 02 23:09:59 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Apr 02 23:09:59 2021 +0000" }, "message": "[automerger skipped] Merge \"[RESTRICT AUTOMERGE] Fix UAF in clearkey service\u0027s MemoryFileSystem\" into qt-dev am: 6889557362 am: b68392b02e -s ours am: 78cc122909 am: 1bedb86ac7\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/13711823\n\nChange-Id: I44851b4f94991c7f2dd4bfcda95a10d8016122ba\n" }, { "commit": "ea7e6b49c9035ea7cb6fe77704956a2c4fb417dc", "tree": "be93d04da0a741711fba9dcd9f347a8a09a2b432", "parents": [ "87019dbad7ac59de96f8f5cde8976a60d23cd8f7", "0245e885d3ec1dd14cdd71c1f4583c67044dd78f" ], "author": { "name": "Edwin Wong", "email": "edwinwong@google.com", "time": "Fri Apr 02 23:09:57 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Apr 02 23:09:57 2021 +0000" }, "message": "[automerger skipped] [RESTRICT AUTOMERGE] Fix UAF in clearkey service\u0027s MemoryFileSystem am: 9ba33b3586 -s ours am: 0a2abba43f -s ours am: a4e3bea9e4 am: 0245e885d3\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/13711823\n\nChange-Id: I35220c88ee1b9d023ff770416c0b674f13c42a01\n" }, { "commit": "e0d2fe2eea201f30437686a2af741c4ef3ca9a1f", "tree": "d10718de548c8e43971753876c587731106eaf5f", "parents": [ "1e72be7464f0feef8f4bac40eb70ca3deef21a8b", "87019dbad7ac59de96f8f5cde8976a60d23cd8f7" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Fri Apr 02 22:57:25 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Apr 02 22:57:25 2021 +0000" }, "message": "Merge \"Vts: refactor encoder code\" am: 66547278fc am: 5f16bac96e am: 87019dbad7\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1653831\n\nChange-Id: Ib5aee8c9c1a06c116899c84aa3c00c77166d14d2\n" }, { "commit": "1e72be7464f0feef8f4bac40eb70ca3deef21a8b", "tree": "147013a3bc1e5297898a625f8f5683e4a79aec3e", "parents": [ "1221851565eb41ff4cb1741b77bf099289e027b9", "d39aa366459fc1be24d8a8d6cc53fb225b385091" ], "author": { "name": "Steven Moreland", "email": "smoreland@google.com", "time": "Fri Apr 02 22:57:17 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Apr 02 22:57:17 2021 +0000" }, "message": "Merge changes from topic \"libbinder-remove-mediaresourcemanager\" am: ca8f637b46 am: 9ff3f243b3 am: d39aa36645\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1662925\n\nChange-Id: I5ee43df49247d22adb93c3311faa754252d6aab0\n" }, { "commit": "1221851565eb41ff4cb1741b77bf099289e027b9", "tree": "bd407ff5ab761d16a04f2786be22c01a0d0f0294", "parents": [ "7c913b2aac9d2073542f6cbf7bce7869b768b5d6", "a655b52dc30fa79aeb25dcb86c28a67e9f7ff42e" ], "author": { "name": "Steven Moreland", "email": "smoreland@google.com", "time": "Fri Apr 02 22:57:16 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Apr 02 22:57:16 2021 +0000" }, "message": "[automerger skipped] Noop mediaresourcemanager change to avoid conflict am: eb009aafc4 am: c92a697f01 am: a655b52dc3 -s ours\n\nam skip reason: skip tag Change-Id I943317f71ea43470d86c5e0ea5b703d23f08a678 with SHA-1 c7303e8842 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1662927\n\nChange-Id: I23013f9597a805a5fd5b81faf34f7bb41122272a\n" }, { "commit": "7c913b2aac9d2073542f6cbf7bce7869b768b5d6", "tree": "bd407ff5ab761d16a04f2786be22c01a0d0f0294", "parents": [ "74f46a91c20fe6d5d39035f25943b3fc4c70984e", "cc52fcd7732f737ed2327b6475c71c7ef8588c59" ], "author": { "name": "Edwin Wong", "email": "edwinwong@google.com", "time": "Fri Apr 02 22:56:48 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Apr 02 22:56:48 2021 +0000" }, "message": "Merge \"Fix UAF in clearkey service\u0027s MemoryFileSystem\" into rvc-dev am: 00b96f0a78 am: 9d08f19e6c am: cc52fcd773\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/13462731\n\nChange-Id: Ia3f6e1f9e2c56ac798bd7ed93f48a9362223e26f\n" }, { "commit": "74f46a91c20fe6d5d39035f25943b3fc4c70984e", "tree": "bd407ff5ab761d16a04f2786be22c01a0d0f0294", "parents": [ "f014ea0325f2ddba4f5203a1ab035a1625940f96", "d63117a52de0c3713583a31ef73273fdc6a62743" ], "author": { "name": "Ray Essick", "email": "essick@google.com", "time": "Fri Apr 02 22:55:41 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Apr 02 22:55:41 2021 +0000" }, "message": "Merge changes from topic \"qp-handling\" am: 8f6db1d7a6 am: 5ca572a2ac am: d63117a52d\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1651750\n\nChange-Id: Ie465891bb608fca9115cba7b528386fbcfbdc962\n" }, { "commit": "f014ea0325f2ddba4f5203a1ab035a1625940f96", "tree": "bd407ff5ab761d16a04f2786be22c01a0d0f0294", "parents": [ "25600d1435b8b713ff320636841cc941cb3c0266", "b6ebaa6589a5e888ca6987d7488f4982dc95194b" ], "author": { "name": "Ray Essick", "email": "essick@google.com", "time": "Fri Apr 02 22:55:40 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Apr 02 22:55:40 2021 +0000" }, "message": "[automerger skipped] AVC encoder processes QP bounding parameters am: 825104de21 am: 989593b632 am: b6ebaa6589 -s ours\n\nam skip reason: skipped by user essick\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1651749\n\nChange-Id: Idd5a6222af22d01798a724900f357cb6b171c3a3\n" }, { "commit": "25600d1435b8b713ff320636841cc941cb3c0266", "tree": "bd407ff5ab761d16a04f2786be22c01a0d0f0294", "parents": [ "6c8c8e9ea9f509643c4eccb6174ab73addc7db4e", "ed4d52863c739bb672ee177192cad7af83a16759" ], "author": { "name": "Ray Essick", "email": "essick@google.com", "time": "Fri Apr 02 22:55:39 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Apr 02 22:55:39 2021 +0000" }, "message": "Rework how QP bounds are passed am: a9a724a0d1 am: 69f64a810f am: ed4d52863c\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1651748\n\nChange-Id: I3b48242b65a1e3c13ecc49d42371866e8b0cfc38\n" }, { "commit": "6c8c8e9ea9f509643c4eccb6174ab73addc7db4e", "tree": "bd407ff5ab761d16a04f2786be22c01a0d0f0294", "parents": [ "c783d6155974f08f445ced2be1b9f593d30d4748", "a53f7c8ce23144621d43a470c82239bf3a91e5b4" ], "author": { "name": "Ray Essick", "email": "essick@google.com", "time": "Fri Apr 02 22:55:38 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Apr 02 22:55:38 2021 +0000" }, "message": "[automerger skipped] Codec2 pass standard QP bounding keys am: b8865c1021 am: ebb898346f am: a53f7c8ce2 -s ours\n\nam skip reason: skipped by user essick\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1651747\n\nChange-Id: Ideaee83e5172325385c54479280d92aa0da4b289\n" }, { "commit": "c783d6155974f08f445ced2be1b9f593d30d4748", "tree": "bd407ff5ab761d16a04f2786be22c01a0d0f0294", "parents": [ "663ed21e959ba05bdc25937ee994d80020181524", "855f8ada03146ba324ae8e77791033d4ad4ef05a" ], "author": { "name": "Ray Essick", "email": "essick@google.com", "time": "Fri Apr 02 22:55:35 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Apr 02 22:55:35 2021 +0000" }, "message": "[automerger skipped] Merge \"Media constans not yet in aosp\" am: 14ce184de4 am: 0d824defe9 am: 855f8ada03 -s ours\n\nam skip reason: skip tag Change-Id Ic3635c425bbd8f47907155be27b0eca76d6fffb0 with SHA-1 19042f137e is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1623339\n\nChange-Id: I270d6ece936ece0f7d34266a4b3d0f61c4aa0b79\n" }, { "commit": "56af5904c128b2e41f4bc95948e3e1137c43a537", "tree": "a038fd5f4989071e6652f4ab55909dde9ce92ce2", "parents": [ "cc0a8fc9729631c411cc5c02ec6902f0ea2891df", "78cc1229099782c4f70a0bf3b1de61aa8c368398" ], "author": { "name": "Edwin Wong", "email": "edwinwong@google.com", "time": "Fri Apr 02 22:35:40 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Apr 02 22:35:40 2021 +0000" }, "message": "[automerger skipped] Merge \"[RESTRICT AUTOMERGE] Fix UAF in clearkey service\u0027s MemoryFileSystem\" into qt-dev am: 6889557362 am: b68392b02e -s ours am: 78cc122909\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/13711823\n\nChange-Id: I1d6044cf8b1981b99ed413cc352d72c809d3d0ee\n" }, { "commit": "cc0a8fc9729631c411cc5c02ec6902f0ea2891df", "tree": "a038fd5f4989071e6652f4ab55909dde9ce92ce2", "parents": [ "3f0b90d04981806d340f088255ba4f16711e8aa4", "a4e3bea9e480557bab255950a7a7c2f227165edf" ], "author": { "name": "Edwin Wong", "email": "edwinwong@google.com", "time": "Fri Apr 02 22:35:39 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Apr 02 22:35:39 2021 +0000" }, "message": "[automerger skipped] [RESTRICT AUTOMERGE] Fix UAF in clearkey service\u0027s MemoryFileSystem am: 9ba33b3586 -s ours am: 0a2abba43f -s ours am: a4e3bea9e4\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/13711823\n\nChange-Id: I9d58e7ae786eef8426d82fe84a10122df37d064a\n" }, { "commit": "87019dbad7ac59de96f8f5cde8976a60d23cd8f7", "tree": "be93d04da0a741711fba9dcd9f347a8a09a2b432", "parents": [ "d39aa366459fc1be24d8a8d6cc53fb225b385091", "5f16bac96ede2ab6f127bd342a5b46539ec3ef1e" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Fri Apr 02 22:31:33 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Apr 02 22:31:33 2021 +0000" }, "message": "Merge \"Vts: refactor encoder code\" am: 66547278fc am: 5f16bac96e\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1653831\n\nChange-Id: I05c1f61d8e84db4976dfb6952ea181e1f16f434a\n" }, { "commit": "d39aa366459fc1be24d8a8d6cc53fb225b385091", "tree": "6cb9cdfb9b74dc69b444b9103ac330389496193f", "parents": [ "a655b52dc30fa79aeb25dcb86c28a67e9f7ff42e", "9ff3f243b3a7bef104a2109602b894d272d11f32" ], "author": { "name": "Steven Moreland", "email": "smoreland@google.com", "time": "Fri Apr 02 22:31:14 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Apr 02 22:31:14 2021 +0000" }, "message": "Merge changes from topic \"libbinder-remove-mediaresourcemanager\" am: ca8f637b46 am: 9ff3f243b3\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1662925\n\nChange-Id: Ia2e1144e2202539b54c8625c4cc2da8d381e5d26\n" }, { "commit": "a655b52dc30fa79aeb25dcb86c28a67e9f7ff42e", "tree": "f940d382a2157f91da29e68c18fc9d14beecbef9", "parents": [ "cc52fcd7732f737ed2327b6475c71c7ef8588c59", "c92a697f012bcccc98a563a9fa0f0d8acac03be8" ], "author": { "name": "Steven Moreland", "email": "smoreland@google.com", "time": "Fri Apr 02 22:31:13 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Apr 02 22:31:13 2021 +0000" }, "message": "Noop mediaresourcemanager change to avoid conflict am: eb009aafc4 am: c92a697f01\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1662927\n\nChange-Id: Ie18ff66243b92f95ff877f52e0f86121e42ed5ce\n" }, { "commit": "1bedb86ac7a37d063d7c92d954aeffbaa8ee29f4", "tree": "3aa9b1e5f90509f3488c32d28e74d6b0de275b67", "parents": [ "0245e885d3ec1dd14cdd71c1f4583c67044dd78f", "78cc1229099782c4f70a0bf3b1de61aa8c368398" ], "author": { "name": "Edwin Wong", "email": "edwinwong@google.com", "time": "Fri Apr 02 22:30:50 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Apr 02 22:30:50 2021 +0000" }, "message": "[automerger skipped] Merge \"[RESTRICT AUTOMERGE] Fix UAF in clearkey service\u0027s MemoryFileSystem\" into qt-dev am: 6889557362 am: b68392b02e -s ours am: 78cc122909\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/13711823\n\nChange-Id: I3abf202ad73ee4b32885930b7ff6df13deb2cdcb\n" }, { "commit": "0245e885d3ec1dd14cdd71c1f4583c67044dd78f", "tree": "3aa9b1e5f90509f3488c32d28e74d6b0de275b67", "parents": [ "9d08f19e6c395d5b14a2c12472fb81937ddaeca8", "a4e3bea9e480557bab255950a7a7c2f227165edf" ], "author": { "name": "Edwin Wong", "email": "edwinwong@google.com", "time": "Fri Apr 02 22:30:49 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Apr 02 22:30:49 2021 +0000" }, "message": "[automerger skipped] [RESTRICT AUTOMERGE] Fix UAF in clearkey service\u0027s MemoryFileSystem am: 9ba33b3586 -s ours am: 0a2abba43f -s ours am: a4e3bea9e4\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/13711823\n\nChange-Id: Ic56cc6361b40290199fa024f3140ba7979cd675e\n" }, { "commit": "240279ecd56717350e597a21987a772c3e88ccbc", "tree": "0b42e31d168af743d9796a37d7c0cd5b333f0af7", "parents": [ "314fb15efcdcf216144c359d9c94332c26bdc1b9" ], "author": { "name": "Edwin Wong", "email": "edwinwong@google.com", "time": "Fri Jan 22 20:38:33 2021 -0800" }, "committer": { "name": "Edwin Wong", "email": "edwinwong@google.com", "time": "Fri Apr 02 15:19:14 2021 -0700" }, "message": "[RESTRICT AUTOMERGE] Fix CryptoPlugin use after free vulnerability.\n\nThe shared memory buffer used by srcPtr can be freed by another\nthread because it is not protected by a mutex. Subsequently,\na use after free AIGABRT can occur in a race condition.\n\nSafetyNet logging is not added to avoid log spamming. The\nmutex lock is called to setup for decryption, which is\ncalled frequently.\n\nThe crash was reproduced on the device before the fix.\nVerified the test passes after the fix.\n\nTest: sts\n sts-tradefed run sts-engbuild-no-spl-lock -m StsHostTestCases --test android.security.sts.Bug_176495665#testPocBug_176495665\n\nTest: push to device with target_hwasan-userdebug build\n adb shell /data/local/tmp/Bug-176495665_sts64\n\nBug: 176495665\nBug: 176444161\nChange-Id: I3bfe5c34acb41608d1250a075984ab7860076331\n" }, { "commit": "663ed21e959ba05bdc25937ee994d80020181524", "tree": "bd407ff5ab761d16a04f2786be22c01a0d0f0294", "parents": [ "314fb15efcdcf216144c359d9c94332c26bdc1b9", "77d0419509065a574d8654af541bf3611c758244" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Fri Apr 02 22:18:53 2021 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Apr 02 22:18:53 2021 +0000" }, "message": "Merge \"Camera: Fix up log message for CameraProviderManager\" into sc-dev" }, { "commit": "5f16bac96ede2ab6f127bd342a5b46539ec3ef1e", "tree": "de1c9cbac47f73e7bbf676a2ecc8d3f917bca82d", "parents": [ "9ff3f243b3a7bef104a2109602b894d272d11f32", "66547278fcb2b2dcdfd7969503560294fdc6d15f" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Fri Apr 02 22:11:01 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Apr 02 22:11:01 2021 +0000" }, "message": "Merge \"Vts: refactor encoder code\" am: 66547278fc\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1653831\n\nChange-Id: I5f56951e861f0dda251149b42acaba25e1ec2ac9\n" }, { "commit": "66547278fcb2b2dcdfd7969503560294fdc6d15f", "tree": "de1c9cbac47f73e7bbf676a2ecc8d3f917bca82d", "parents": [ "ca8f637b46e43742eb4e869e00854ed6b903c258", "9a8b8b33edf43072899388f121f1a54b453028c0" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Fri Apr 02 21:56:51 2021 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Fri Apr 02 21:56:51 2021 +0000" }, "message": "Merge \"Vts: refactor encoder code\"" }, { "commit": "5ff3b953112ccb7414d99f501e349d4d795d746a", "tree": "d4675a82922bcdab53557e1db4f818dcfa3bde70", "parents": [ "6134b84b26ea7071891f5b38fd2783f6c227b7e6" ], "author": { "name": "Phil Burk", "email": "philburk@google.com", "time": "Fri Apr 02 17:29:11 2021 +0000" }, "committer": { "name": "Phil Burk", "email": "philburk@google.com", "time": "Fri Apr 02 21:56:37 2021 +0000" }, "message": "aaudio: check for callback thread outside the lock\n\nCalling AAudioStream_requestStop() from a callback is illegal.\nBut it should just return and error and not hang.\nThe hang can occur if AAudioStream_close() is called at the same time\nfrom another thread.\n\nBug: 184370309\nTest: adb shell test_disconnect_race\nChange-Id: I5e0752611d4d3d3dd994a10e82a339fa39e65d42\n" }, { "commit": "9ff3f243b3a7bef104a2109602b894d272d11f32", "tree": "5aec1e64059cf37d2567d95b447b70f1b01945b4", "parents": [ "c92a697f012bcccc98a563a9fa0f0d8acac03be8", "ca8f637b46e43742eb4e869e00854ed6b903c258" ], "author": { "name": "Steven Moreland", "email": "smoreland@google.com", "time": "Fri Apr 02 21:51:16 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Apr 02 21:51:16 2021 +0000" }, "message": "Merge changes from topic \"libbinder-remove-mediaresourcemanager\" am: ca8f637b46\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1662925\n\nChange-Id: Ic8cbcbc6201b80132fcf0e9b3c2edc0c97ba05d9\n" }, { "commit": "c92a697f012bcccc98a563a9fa0f0d8acac03be8", "tree": "abe995155fa0b9c35e9919c95c8baf414543d35d", "parents": [ "5ca572a2acaa28ff4e4e9232e58d34dd775d0711", "eb009aafc4e1879361e91e1ba84c15b53f9995a7" ], "author": { "name": "Steven Moreland", "email": "smoreland@google.com", "time": "Fri Apr 02 21:51:01 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Apr 02 21:51:01 2021 +0000" }, "message": "Noop mediaresourcemanager change to avoid conflict am: eb009aafc4\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1662927\n\nChange-Id: I11ceaf28370e597020710a35fb15d5181ab0016e\n" }, { "commit": "78cc1229099782c4f70a0bf3b1de61aa8c368398", "tree": "863c48351589a095596586d6fd2d58fc44f5a238", "parents": [ "a4e3bea9e480557bab255950a7a7c2f227165edf", "b68392b02eb378e033913cf76ddc6e5ccc31a1de" ], "author": { "name": "Edwin Wong", "email": "edwinwong@google.com", "time": "Fri Apr 02 21:49:28 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Apr 02 21:49:28 2021 +0000" }, "message": "[automerger skipped] Merge \"[RESTRICT AUTOMERGE] Fix UAF in clearkey service\u0027s MemoryFileSystem\" into qt-dev am: 6889557362 am: b68392b02e -s ours\n\nam skip reason: subject contains skip directive\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/13711823\n\nChange-Id: Iceb881f3b875f5ce6c13cbe8716d3fd19ca3cde0\n" }, { "commit": "a4e3bea9e480557bab255950a7a7c2f227165edf", "tree": "863c48351589a095596586d6fd2d58fc44f5a238", "parents": [ "00b96f0a78ae23da72f46b0181a61a19198fce77", "0a2abba43f53a0d3716714a996d53cffe70ee0d5" ], "author": { "name": "Edwin Wong", "email": "edwinwong@google.com", "time": "Fri Apr 02 21:49:26 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Apr 02 21:49:26 2021 +0000" }, "message": "[automerger skipped] [RESTRICT AUTOMERGE] Fix UAF in clearkey service\u0027s MemoryFileSystem am: 9ba33b3586 -s ours am: 0a2abba43f -s ours\n\nam skip reason: subject contains skip directive\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/13711823\n\nChange-Id: Ief269862c12e11595281006f6271ebe4832e4c60\n" } ], "next": "314fb15efcdcf216144c359d9c94332c26bdc1b9" }