)]}' { "log": [ { "commit": "3ae974b4e59ca2f1880b8eb76e53c8f550cf96bf", "tree": "9918e6e5d753653b9d5d2e5a19ade161dd65008b", "parents": [ "583d18e45ae5893f51d937caae8a5b83629c6fed", "19a4793fd2e6a9d0ec73c09949cef64dab831345" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Mon Sep 07 02:50:31 2020 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Sep 07 02:50:31 2020 +0000" }, "message": "Merge \"Remove unused mediaswcodec.rc on system\"" }, { "commit": "583d18e45ae5893f51d937caae8a5b83629c6fed", "tree": "b952f4ea666e4db2b95e9f0dd8c0a4ac91efec4f", "parents": [ "8dbd241e279e1a637502e38af32ef6ead483768f", "e69bfcbc7c7494bf62a100a5058aca0d36a3771e" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Thu Sep 03 17:56:05 2020 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Sep 03 17:56:05 2020 +0000" }, "message": "Merge \"aaudio: use natural burst size for recording\"" }, { "commit": "19a4793fd2e6a9d0ec73c09949cef64dab831345", "tree": "e181f052932a4861920c17d1ac13449cdbeaf3a3", "parents": [ "6ea4a7734d29692c0a5f3093881a859f959834f4" ], "author": { "name": "Chong Zhang", "email": "chz@google.com", "time": "Thu Sep 03 09:30:45 2020 -0700" }, "committer": { "name": "Chong Zhang", "email": "chz@google.com", "time": "Thu Sep 03 10:29:53 2020 -0700" }, "message": "Remove unused mediaswcodec.rc on system\n\nbug: 163086880\ntest: verify media.swcodec process starts properly;\ncts MediaMetadataRetrieverTest and check that sw decoders\nare used for thumbnail extractions.\n\nChange-Id: Icbf3774a69b4d4699045c4c71fe7dd0567528568\n" }, { "commit": "8dbd241e279e1a637502e38af32ef6ead483768f", "tree": "733edec2f52c4eadf28d30ce670bcdc848cb7fe7", "parents": [ "bf1d0a629c1a606757de52b3e47785bb3304b239", "bcfb2ce24a4eb736d701197293d4337f23ba59c4" ], "author": { "name": "Jiabin Huang", "email": "jiabin@google.com", "time": "Thu Sep 03 17:25:20 2020 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Sep 03 17:25:20 2020 +0000" }, "message": "Merge \"Revert \"Support device role for capture preset.\"\"" }, { "commit": "bf1d0a629c1a606757de52b3e47785bb3304b239", "tree": "dff8999679b4fdb9a436a732e35b3236df56858f", "parents": [ "d58a7bdbb9a23c8c8d341dacc771e2b64df1e31c", "ae8b06eb65df96731e2f7f987afa9babbe83fb08" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Thu Sep 03 15:52:47 2020 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Sep 03 15:52:47 2020 +0000" }, "message": "Merge \"Unit tests w/dynamic content to \"dynamic-presubmit\"\"" }, { "commit": "bcfb2ce24a4eb736d701197293d4337f23ba59c4", "tree": "e4a01d8d1e3c5ccbd3ab7db611315a1b5ea97239", "parents": [ "dddc2aef4e5f9f27a79909f475c31c96eb688200" ], "author": { "name": "Jiabin Huang", "email": "jiabin@google.com", "time": "Thu Sep 03 02:45:05 2020 +0000" }, "committer": { "name": "Jiabin Huang", "email": "jiabin@google.com", "time": "Thu Sep 03 02:45:05 2020 +0000" }, "message": "Revert \"Support device role for capture preset.\"\n\nRevert \"Support set/clear/get preferred device for capture preset.\"\n\nRevert submission 12409575-devicesRoleForCapturePreset\n\nReason for revert: break CarAudioZonesHelperTest\nReverted Changes:\nI92fdb2cbd:Support set/clear/get preferred device for capture...\nI44e67d5b0:Add a helper function of checking if an audio sour...\nIb16ab2ec8:Support device role for capture preset.\nI46bd8dfb5:Add tests for set/get/clearPreferredDeviceForCaptu...\n\nChange-Id: I80f5267a01b48d01681a2d97cf3eb9de573ca6b5\n" }, { "commit": "d58a7bdbb9a23c8c8d341dacc771e2b64df1e31c", "tree": "5b6576369454cc063abe8edc8aeeb0ec2ce9f193", "parents": [ "2162f7b11434dafa6e70d39068d870dba3a754a8", "9447b48f36b1bf26645e6256dd29224b6a398161" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Thu Sep 03 01:18:14 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Sep 03 01:18:14 2020 +0000" }, "message": "Merge \"audio flinger: handle race condition in AudioRecord creation\" into rvc-qpr-dev am: d1fa237519 am: 9447b48f36\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/12484593\n\nChange-Id: I2647d7c8feb9f2ca7dfccd2b87c488201c6a8965\n" }, { "commit": "9447b48f36b1bf26645e6256dd29224b6a398161", "tree": "62bc6e0895af051df03446dc2c5ecca8dd288d0f", "parents": [ "37e93d1bc4df8b2d9682c48236bb4dae87d6dd1b", "d1fa2375194096937bbdfd2def97969c4336191b" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Thu Sep 03 00:53:20 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Sep 03 00:53:20 2020 +0000" }, "message": "Merge \"audio flinger: handle race condition in AudioRecord creation\" into rvc-qpr-dev am: d1fa237519\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/12484593\n\nChange-Id: I5e330127a6ef2efe394b06524af5ae20f01a71bc\n" }, { "commit": "d1fa2375194096937bbdfd2def97969c4336191b", "tree": "f2873c68b18cd34fec81208f8b5286c86b66985e", "parents": [ "35238dd6585645018f7a7a8a32fdece432458ce7", "717bc28fc5959c0edb2bbd86692ba5164893f719" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Thu Sep 03 00:22:46 2020 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Sep 03 00:22:46 2020 +0000" }, "message": "Merge \"audio flinger: handle race condition in AudioRecord creation\" into rvc-qpr-dev" }, { "commit": "2162f7b11434dafa6e70d39068d870dba3a754a8", "tree": "5b6576369454cc063abe8edc8aeeb0ec2ce9f193", "parents": [ "f3a626fa54d1ad52673655edaf849b5a6b7c44ab", "37e93d1bc4df8b2d9682c48236bb4dae87d6dd1b" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Wed Sep 02 23:25:29 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Sep 02 23:25:29 2020 +0000" }, "message": "Merge \"Allow graceful degradation of MediaProfile with broken configuration.\" am: df913f7b93 am: 11e6000285 am: ed26941cd3 am: 876d943f7e am: 37e93d1bc4\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1289076\n\nChange-Id: I92c19179463550ded5b56d24421507566b422b18\n" }, { "commit": "37e93d1bc4df8b2d9682c48236bb4dae87d6dd1b", "tree": "9b8b6dd0456585a36d18a959f65d4b197eaf42bc", "parents": [ "5294eb92f5e27c9872edcd6a449370a3bf5cd7aa", "876d943f7ed1c75688338c9072489d50ef4bae8f" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Wed Sep 02 22:48:16 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Sep 02 22:48:16 2020 +0000" }, "message": "Merge \"Allow graceful degradation of MediaProfile with broken configuration.\" am: df913f7b93 am: 11e6000285 am: ed26941cd3 am: 876d943f7e\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1289076\n\nChange-Id: If61efad4a80aa65e3e9f6fd0c9d6529f9ead9f58\n" }, { "commit": "876d943f7ed1c75688338c9072489d50ef4bae8f", "tree": "a2337a0b7c118974cc7b537a08f315dc3768c236", "parents": [ "6848641a68a245c9acdb6b0563b61af05fe5d688", "ed26941cd3de067436e659adef120d583ea77c98" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Wed Sep 02 22:17:02 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Sep 02 22:17:02 2020 +0000" }, "message": "Merge \"Allow graceful degradation of MediaProfile with broken configuration.\" am: df913f7b93 am: 11e6000285 am: ed26941cd3\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1289076\n\nChange-Id: I6d536e6b1059fc53acec94f22cddd6783da66999\n" }, { "commit": "e69bfcbc7c7494bf62a100a5058aca0d36a3771e", "tree": "0590380e03dbdefb57c8094cb996c531ce9e739f", "parents": [ "f3a626fa54d1ad52673655edaf849b5a6b7c44ab" ], "author": { "name": "Phil Burk", "email": "philburk@google.com", "time": "Thu Aug 20 00:10:35 2020 +0000" }, "committer": { "name": "Phil Burk", "email": "philburk@google.com", "time": "Wed Sep 02 21:48:03 2020 +0000" }, "message": "aaudio: use natural burst size for recording\n\nThis is similar to ag/12420089\nbut is for input streams.\n\nBUG: 165675305\nTest: see bug for detailed repro steps\nTest: atest CtsNativeMediaAAudioTestCases\nChange-Id: I9b6dfb4d4e9c22d8aac51f86149d7c3bf29cb990\n" }, { "commit": "ed26941cd3de067436e659adef120d583ea77c98", "tree": "2fff59547ebc5644d2ebda5fc03158473cc21b2f", "parents": [ "8b712f70450c5318b46579c6b2c3b3d75be95fc8", "11e6000285d6338d4d62d16c035ed14e191f8d40" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Wed Sep 02 21:35:11 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Sep 02 21:35:11 2020 +0000" }, "message": "Merge \"Allow graceful degradation of MediaProfile with broken configuration.\" am: df913f7b93 am: 11e6000285\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1289076\n\nChange-Id: I6a87dac3f3e050d608077f6afe55b83f028edb88\n" }, { "commit": "11e6000285d6338d4d62d16c035ed14e191f8d40", "tree": "6ed0c602fe86115e7676da19cf89e1a54b1d3078", "parents": [ "697ce36c44e6c3674b26039cc2f8da76e3990f30", "df913f7b9357c3d039508fecdb57b73e825f7d22" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Wed Sep 02 21:05:08 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Sep 02 21:05:08 2020 +0000" }, "message": "Merge \"Allow graceful degradation of MediaProfile with broken configuration.\" am: df913f7b93\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1289076\n\nChange-Id: I0127f5ec69825b5568c57cc5cc6f57f9ecac8f14\n" }, { "commit": "df913f7b9357c3d039508fecdb57b73e825f7d22", "tree": "f302d75022dbf4c2a0327a75b7745953e294a8ec", "parents": [ "96a663b0ef0b0273111a47aa2c3fdc4029a36e4e", "032f7a122fd4a778147dc348b1954ac7dc112a84" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Wed Sep 02 20:43:06 2020 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Wed Sep 02 20:43:06 2020 +0000" }, "message": "Merge \"Allow graceful degradation of MediaProfile with broken configuration.\"" }, { "commit": "f3a626fa54d1ad52673655edaf849b5a6b7c44ab", "tree": "c53c739d09c181a4cdd7d9eb993b441c03615d50", "parents": [ "6ea4a7734d29692c0a5f3093881a859f959834f4", "4e8396f030bc2d63714f345e1b9985adc0733211" ], "author": { "name": "Phil Burk", "email": "philburk@google.com", "time": "Wed Sep 02 19:50:36 2020 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Sep 02 19:50:36 2020 +0000" }, "message": "Merge \"aaudio: fix crash on disconnect for shared streams\"" }, { "commit": "6ea4a7734d29692c0a5f3093881a859f959834f4", "tree": "5586a760a9464d5a3617fd942f8c1967fa130dbf", "parents": [ "42c0447db6f279e23cf4a3dabf4e0a6764277b6b", "5294eb92f5e27c9872edcd6a449370a3bf5cd7aa" ], "author": { "name": "Hayden Gomes", "email": "haydengomes@google.com", "time": "Wed Sep 02 17:11:51 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Sep 02 17:11:51 2020 +0000" }, "message": "[automerger skipped] Merge \"audio policy: fix concurrent capture policy for virtual sources\" into rvc-qpr-dev am: 35238dd658 am: 5294eb92f5 -s ours\n\nam skip reason: Change-Id I2f28026dbecfa72b5d44f52b95538fc13996627b with SHA-1 14a8863016 is in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/12196105\n\nChange-Id: I58335b10f98027fa0dc53018b3eb361595dd66ae\n" }, { "commit": "5294eb92f5e27c9872edcd6a449370a3bf5cd7aa", "tree": "789d0b6bdb31ea469f7d645b0194aab3e76a82f3", "parents": [ "738f5ecdaea2af982ba00c4b974a33dbac8f7d0c", "35238dd6585645018f7a7a8a32fdece432458ce7" ], "author": { "name": "Hayden Gomes", "email": "haydengomes@google.com", "time": "Wed Sep 02 16:33:33 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Sep 02 16:33:33 2020 +0000" }, "message": "Merge \"audio policy: fix concurrent capture policy for virtual sources\" into rvc-qpr-dev am: 35238dd658\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/12196105\n\nChange-Id: I6029ece39734bea6bdcad7cc1ea5f2b2ab5e593a\n" }, { "commit": "42c0447db6f279e23cf4a3dabf4e0a6764277b6b", "tree": "5586a760a9464d5a3617fd942f8c1967fa130dbf", "parents": [ "a85c486cc4226cf2cb63c7f1542d436b6610ab86", "dddc2aef4e5f9f27a79909f475c31c96eb688200" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Wed Sep 02 16:12:47 2020 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Sep 02 16:12:47 2020 +0000" }, "message": "Merge \"Support device role for capture preset.\"" }, { "commit": "35238dd6585645018f7a7a8a32fdece432458ce7", "tree": "acebd01148680908072bb155c37217cf0aaad8e8", "parents": [ "23d433f4a27a05dc89e558c06032b305ad0337f6", "55fd81d7e1011565e894a4530eb8693c824f45b4" ], "author": { "name": "Hayden Gomes", "email": "haydengomes@google.com", "time": "Wed Sep 02 15:55:30 2020 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Sep 02 15:55:30 2020 +0000" }, "message": "Merge \"audio policy: fix concurrent capture policy for virtual sources\" into rvc-qpr-dev" }, { "commit": "a85c486cc4226cf2cb63c7f1542d436b6610ab86", "tree": "5af63735f8315796709b4cb08aa60b573b73c96f", "parents": [ "7ff4b1e40d7eee36862cdb4a88e5776157e4bb5b", "738f5ecdaea2af982ba00c4b974a33dbac8f7d0c" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Wed Sep 02 02:22:37 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Sep 02 02:22:37 2020 +0000" }, "message": "[automerger skipped] Merge \"framework/av,C2SoftGav1Dec: update to libgav1 v0.16.0\" into rvc-qpr-dev am: 23d433f4a2 am: 738f5ecdae -s ours\n\nam skip reason: Change-Id Idc713f4b10776cfb6b7fa2d75b2162c3b85d3313 with SHA-1 4f5bdb78a4 is in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/12250263\n\nChange-Id: I89aa85f55883afd7a931dec28eca999b4e43a665\n" }, { "commit": "738f5ecdaea2af982ba00c4b974a33dbac8f7d0c", "tree": "db33075ab607ca808a841c5597288e60d498c147", "parents": [ "32377d64e483cd1ff1b3fbb8c0d7e2e782a95b1b", "23d433f4a27a05dc89e558c06032b305ad0337f6" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Wed Sep 02 02:21:17 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Sep 02 02:21:17 2020 +0000" }, "message": "Merge \"framework/av,C2SoftGav1Dec: update to libgav1 v0.16.0\" into rvc-qpr-dev am: 23d433f4a2\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/12250263\n\nChange-Id: I6c728288c7b9bcb1c716cae0d81626c9affed65e\n" }, { "commit": "7ff4b1e40d7eee36862cdb4a88e5776157e4bb5b", "tree": "5af63735f8315796709b4cb08aa60b573b73c96f", "parents": [ "1e776da5200fd756069e2690d1f91489465daa2f", "32377d64e483cd1ff1b3fbb8c0d7e2e782a95b1b" ], "author": { "name": "Peiyong Lin", "email": "lpy@google.com", "time": "Wed Sep 02 02:20:57 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Sep 02 02:20:57 2020 +0000" }, "message": "Use more inclusive terms. am: 697ce36c44 am: 8b712f7045 am: 6848641a68 am: 32377d64e4\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/12505403\n\nChange-Id: I5c0a071cdffbcd53a199fc15e59641623b665b5b\n" }, { "commit": "23d433f4a27a05dc89e558c06032b305ad0337f6", "tree": "9a0e4a5fac0733c00b8158b1df5688f86e419ca8", "parents": [ "3626bf513e108d230ca5ec0e8fa37ab95c217d45", "b7aee6e111fff30e4e0f5d4a4b4a60ed033d67d8" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Wed Sep 02 02:00:59 2020 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Sep 02 02:00:59 2020 +0000" }, "message": "Merge \"framework/av,C2SoftGav1Dec: update to libgav1 v0.16.0\" into rvc-qpr-dev" }, { "commit": "1e776da5200fd756069e2690d1f91489465daa2f", "tree": "5af63735f8315796709b4cb08aa60b573b73c96f", "parents": [ "3f1a1165d04ed5bd45e993624b4b19a9eeb84cd1", "65c647c35db9494c118b9830b8554f4169ec65a9" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Wed Sep 02 01:59:15 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Sep 02 01:59:15 2020 +0000" }, "message": "[automerger skipped] Merge \"Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)\" into stage-aosp-master am: 4ffca8764b -s ours am: b1cfe1266f -s ours am: e12b63aff3 -s ours am: 65c647c35d -s ours\n\nam skip reason: Change-Id Ie94127c1e981cb18671d5137ba0d39355d1353da with SHA-1 924eccfd6f is in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/12485043\n\nChange-Id: I99b7a35f79748c3e70757bb4bd03a9843520adce\n" }, { "commit": "32377d64e483cd1ff1b3fbb8c0d7e2e782a95b1b", "tree": "8750af6324624c5ae407e45f3de477f39b415525", "parents": [ "65c647c35db9494c118b9830b8554f4169ec65a9", "6848641a68a245c9acdb6b0563b61af05fe5d688" ], "author": { "name": "Peiyong Lin", "email": "lpy@google.com", "time": "Wed Sep 02 01:05:42 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Sep 02 01:05:42 2020 +0000" }, "message": "Use more inclusive terms. am: 697ce36c44 am: 8b712f7045 am: 6848641a68\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/12505403\n\nChange-Id: I1bd8776ce57ec6b29556c599b95ab8feb9154cb7\n" }, { "commit": "6848641a68a245c9acdb6b0563b61af05fe5d688", "tree": "46ce02739a2899d0c4c1c356ec955d7242ea753b", "parents": [ "e12b63aff36f973cdea38a2d391182ba24249eb8", "8b712f70450c5318b46579c6b2c3b3d75be95fc8" ], "author": { "name": "Peiyong Lin", "email": "lpy@google.com", "time": "Wed Sep 02 00:45:40 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Sep 02 00:45:40 2020 +0000" }, "message": "Use more inclusive terms. am: 697ce36c44 am: 8b712f7045\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/12505403\n\nChange-Id: I55ea7032460fd52448feeaf840ba8698db3e2242\n" }, { "commit": "8b712f70450c5318b46579c6b2c3b3d75be95fc8", "tree": "313257662bcc66636d05c6a27e530a2ea72429f1", "parents": [ "b1cfe1266fd543b347107356a57c70f58ceb005e", "697ce36c44e6c3674b26039cc2f8da76e3990f30" ], "author": { "name": "Peiyong Lin", "email": "lpy@google.com", "time": "Wed Sep 02 00:21:50 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Sep 02 00:21:50 2020 +0000" }, "message": "Use more inclusive terms. am: 697ce36c44\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/12505403\n\nChange-Id: Ice1685616e48b8fcdcb46c320b208707045be1ed\n" }, { "commit": "b7aee6e111fff30e4e0f5d4a4b4a60ed033d67d8", "tree": "69f84a65bad554b027c12cf540d19fa673e658db", "parents": [ "c4ba40d49f0862487dea32b3efffbd291802130d" ], "author": { "name": "James Zern", "email": "jzern@google.com", "time": "Fri Jun 26 13:49:53 2020 -0700" }, "committer": { "name": "Ray Essick", "email": "essick@google.com", "time": "Tue Sep 01 22:38:47 2020 +0000" }, "message": "framework/av,C2SoftGav1Dec: update to libgav1 v0.16.0\n\nthis is dependent on the update to external/libgav1 (ag/12016847,\nchange-id I63361c388d8cf6f652774b07c9475c45951599c5)\n\nBug: 162267932\nTest: playback, cts on sargo-userdebug / sargo_hwasan-userdebug\nTest: aosp_arm-eng aosp_arm64-eng aosp_x86-eng aosp_x86_64-eng build\nChange-Id: Idc713f4b10776cfb6b7fa2d75b2162c3b85d3313\nMerged-In: Idc713f4b10776cfb6b7fa2d75b2162c3b85d3313\n(cherry picked from commit 4f5bdb78a4c4d4620504733e9e779261e93686b6)\n" }, { "commit": "697ce36c44e6c3674b26039cc2f8da76e3990f30", "tree": "fe1e301cbf22d53ef1b1607ebbe6bce46046a101", "parents": [ "4ffca8764be4b177cd08dfbd0705ad1e236709ce" ], "author": { "name": "Peiyong Lin", "email": "lpy@google.com", "time": "Tue Jul 28 21:01:51 2020 -0700" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Tue Sep 01 22:25:23 2020 +0000" }, "message": "Use more inclusive terms.\n\nBug: b/162288333\nTest: N/A\nChange-Id: I77b216eb01d31a8b494b35b7e867f374de64cacc\n" }, { "commit": "3f1a1165d04ed5bd45e993624b4b19a9eeb84cd1", "tree": "5af63735f8315796709b4cb08aa60b573b73c96f", "parents": [ "a75189ef58bafa6d0f4e4afa99ce37996604f788", "45d6dc964d0fbcfde10dcef07fda68a84b6a2516" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Tue Sep 01 22:23:39 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Sep 01 22:23:39 2020 +0000" }, "message": "Merge \"Fix file permissions to remove execute bit on ordinary files\" am: 96a663b0ef am: 0e30ca6437 am: 4984eb5e21 am: 37e9654973 am: 45d6dc964d\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1416258\n\nChange-Id: Ic7a15541f3f6a835fdd95786a722f92252223e3c\n" }, { "commit": "65c647c35db9494c118b9830b8554f4169ec65a9", "tree": "8750af6324624c5ae407e45f3de477f39b415525", "parents": [ "45d6dc964d0fbcfde10dcef07fda68a84b6a2516", "e12b63aff36f973cdea38a2d391182ba24249eb8" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Tue Sep 01 22:09:48 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Sep 01 22:09:48 2020 +0000" }, "message": "[automerger skipped] Merge \"Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)\" into stage-aosp-master am: 4ffca8764b -s ours am: b1cfe1266f -s ours am: e12b63aff3 -s ours\n\nam skip reason: Change-Id Ie94127c1e981cb18671d5137ba0d39355d1353da with SHA-1 924eccfd6f is in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/12485043\n\nChange-Id: I8ed8d6c9b0a600cb16d26c0db3bcb795659e1166\n" }, { "commit": "45d6dc964d0fbcfde10dcef07fda68a84b6a2516", "tree": "8750af6324624c5ae407e45f3de477f39b415525", "parents": [ "917ca09494b5fbad9f7ef63f85fa3ac1d80d0864", "37e9654973cf0458a30805ef2180265e356e1987" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Tue Sep 01 21:48:42 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Sep 01 21:48:42 2020 +0000" }, "message": "Merge \"Fix file permissions to remove execute bit on ordinary files\" am: 96a663b0ef am: 0e30ca6437 am: 4984eb5e21 am: 37e9654973\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1416258\n\nChange-Id: I27be61eb183692a7b44802d2ed35e0a629441c70\n" }, { "commit": "e12b63aff36f973cdea38a2d391182ba24249eb8", "tree": "46ce02739a2899d0c4c1c356ec955d7242ea753b", "parents": [ "37e9654973cf0458a30805ef2180265e356e1987", "b1cfe1266fd543b347107356a57c70f58ceb005e" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Tue Sep 01 21:46:32 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Sep 01 21:46:32 2020 +0000" }, "message": "[automerger skipped] Merge \"Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)\" into stage-aosp-master am: 4ffca8764b -s ours am: b1cfe1266f -s ours\n\nam skip reason: Change-Id Ie94127c1e981cb18671d5137ba0d39355d1353da with SHA-1 924eccfd6f is in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/12485043\n\nChange-Id: I0816a5eaa48c495e7146fa38fa030169c17b1062\n" }, { "commit": "37e9654973cf0458a30805ef2180265e356e1987", "tree": "46ce02739a2899d0c4c1c356ec955d7242ea753b", "parents": [ "ff30ed79d2c4715e355824980c4978c066ebf177", "4984eb5e21d5918e9195ccb3d9540ed155820ec6" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Tue Sep 01 21:31:21 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Sep 01 21:31:21 2020 +0000" }, "message": "Merge \"Fix file permissions to remove execute bit on ordinary files\" am: 96a663b0ef am: 0e30ca6437 am: 4984eb5e21\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1416258\n\nChange-Id: Ibe802a15ab203d206d898ee4feb7d4a94037e5cf\n" }, { "commit": "4e8396f030bc2d63714f345e1b9985adc0733211", "tree": "0dd44b168b2b9a763cd13518dd55c42b91546c51", "parents": [ "244e5086e3a9d1e4c37350abe0c4e4c09609eba7" ], "author": { "name": "Phil Burk", "email": "philburk@google.com", "time": "Tue Sep 01 20:55:18 2020 +0000" }, "committer": { "name": "Phil Burk", "email": "philburk@google.com", "time": "Tue Sep 01 20:55:18 2020 +0000" }, "message": "aaudio: fix crash on disconnect for shared streams\n\nThis fixes a regression caused by ag/12396646\nThat CL changed the way that AudioStreams are managed\nusing android::sp\u003c\u003e. Unfortunately it caused\na crash in audioserver when shared streams were disconnected.\nThe root cause was calling disconnectedRegisteredStreams()\nfrom a data processing thread, which resulted\nin deleting the object while the thread was using it.\n\nThe call was unnecessary so it was removed.\n\nBug: 164411271\nBug: 166877425\nTest: adb logcat *:F\nTest: Use OboeTester TEST DISCONNECT\nTest: See b/166877425 for more details\nChange-Id: I30fc7f00061a9caf5e3d9f7c8e257102c34f9d92\n" }, { "commit": "b1cfe1266fd543b347107356a57c70f58ceb005e", "tree": "313257662bcc66636d05c6a27e530a2ea72429f1", "parents": [ "4984eb5e21d5918e9195ccb3d9540ed155820ec6", "4ffca8764be4b177cd08dfbd0705ad1e236709ce" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Tue Sep 01 20:36:57 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Sep 01 20:36:57 2020 +0000" }, "message": "[automerger skipped] Merge \"Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)\" into stage-aosp-master am: 4ffca8764b -s ours\n\nam skip reason: Change-Id Ie94127c1e981cb18671d5137ba0d39355d1353da with SHA-1 924eccfd6f is in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/12485043\n\nChange-Id: Ib892e15fb42ba64ec651803a7863844ae4b06ca9\n" }, { "commit": "4984eb5e21d5918e9195ccb3d9540ed155820ec6", "tree": "313257662bcc66636d05c6a27e530a2ea72429f1", "parents": [ "e75114727d73502257ef503451453c6f85ded175", "0e30ca64372f8e4dab5cbe3d2b0e326081c4fb2f" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Tue Sep 01 20:22:55 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Sep 01 20:22:55 2020 +0000" }, "message": "Merge \"Fix file permissions to remove execute bit on ordinary files\" am: 96a663b0ef am: 0e30ca6437\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1416258\n\nChange-Id: Idb94e55c869c66e18349e9ef7f1f02c87bb4ef9d\n" }, { "commit": "4ffca8764be4b177cd08dfbd0705ad1e236709ce", "tree": "be2657e20b7222754d29d14d8f2f1fe309bffc62", "parents": [ "0e30ca64372f8e4dab5cbe3d2b0e326081c4fb2f", "2e40c302d6117ec6eb65f25832a71488367b4dfb" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Tue Sep 01 20:03:43 2020 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Sep 01 20:03:43 2020 +0000" }, "message": "Merge \"Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)\" into stage-aosp-master" }, { "commit": "0e30ca64372f8e4dab5cbe3d2b0e326081c4fb2f", "tree": "1954de8b8b30436bb3fed2fe21b70e1cea8cecab", "parents": [ "054de8d6440fd30238fa9330bcc038cda745b244", "96a663b0ef0b0273111a47aa2c3fdc4029a36e4e" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Tue Sep 01 20:01:44 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Sep 01 20:01:44 2020 +0000" }, "message": "Merge \"Fix file permissions to remove execute bit on ordinary files\" am: 96a663b0ef\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1416258\n\nChange-Id: I29e4415ac61a0bb58524858282731c6c2b3fba17\n" }, { "commit": "96a663b0ef0b0273111a47aa2c3fdc4029a36e4e", "tree": "6e40f2c53934ba0246207e8be722204106f0a5d7", "parents": [ "579a5284be48aec4905160464716011cc7e89b9c", "58fb14aa84f41329fccc7185701ffbf502f77114" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Tue Sep 01 19:26:30 2020 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Tue Sep 01 19:26:30 2020 +0000" }, "message": "Merge \"Fix file permissions to remove execute bit on ordinary files\"" }, { "commit": "a75189ef58bafa6d0f4e4afa99ce37996604f788", "tree": "b106f7b2ed5a2850beea5fa0e7c69b0589489c0b", "parents": [ "2d1d604b1683f1e4be306662296b995b984a2175", "a46b6d3ea608120af74ec7975427eb7f5311f720" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Tue Sep 01 17:43:47 2020 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Sep 01 17:43:47 2020 +0000" }, "message": "Merge \"Fix segfault in capture state registration\"" }, { "commit": "ae8b06eb65df96731e2f7f987afa9babbe83fb08", "tree": "d110cbcc8bbcd39ab21818b33357b4be2f95817f", "parents": [ "4fd7c513cbbb2f16cc651dc920cd4a1c0f8eea90" ], "author": { "name": "Ray Essick", "email": "essick@google.com", "time": "Mon Aug 31 16:18:26 2020 -0700" }, "committer": { "name": "Ray Essick", "email": "essick@google.com", "time": "Mon Aug 31 18:08:14 2020 -0700" }, "message": "Unit tests w/dynamic content to \"dynamic-presubmit\"\n\nput unit tests that need dynamic content into a \"dynamic-presubmit\"\ngrouping so that we can run them with proper flags.\n\nBug: 167284748\nTest: atest --include-subdir frameworks/av/media:dynamic-presubmit \\\n -- --enable-module-dynamic-download\u003dtrue\nChange-Id: I39f9373ab1f543dacfae6b420a6969e1603b25dd\n" }, { "commit": "2d1d604b1683f1e4be306662296b995b984a2175", "tree": "8f3747d50877bec4d7cf061b5bbecca973635940", "parents": [ "4fd7c513cbbb2f16cc651dc920cd4a1c0f8eea90", "917ca09494b5fbad9f7ef63f85fa3ac1d80d0864" ], "author": { "name": "Andy Hung", "email": "hunga@google.com", "time": "Mon Aug 31 22:45:18 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Aug 31 22:45:18 2020 +0000" }, "message": "[automerger skipped] Merge \"AudioMixer: Fix MONO_EXPAND for more than 2 channels\" into rvc-qpr-dev am: 3626bf513e am: 917ca09494 -s ours\n\nam skip reason: Change-Id I45c1d7b429f66a950885bc2913a50f223a7d0248 with SHA-1 2d8397af9a is in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/12172441\n\nChange-Id: I40a4abe45a0a91bbfe76ec6018fe90ad44b4bdce\n" }, { "commit": "917ca09494b5fbad9f7ef63f85fa3ac1d80d0864", "tree": "224b7d6f94ed76aebc7877b1a62f6462ae516a05", "parents": [ "7f572c9b873b86d021056653a9f92887c7ae2ee6", "3626bf513e108d230ca5ec0e8fa37ab95c217d45" ], "author": { "name": "Andy Hung", "email": "hunga@google.com", "time": "Mon Aug 31 22:29:24 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Aug 31 22:29:24 2020 +0000" }, "message": "Merge \"AudioMixer: Fix MONO_EXPAND for more than 2 channels\" into rvc-qpr-dev am: 3626bf513e\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/12172441\n\nChange-Id: I4600b70a84ff09907990642b156121533311d632\n" }, { "commit": "3626bf513e108d230ca5ec0e8fa37ab95c217d45", "tree": "960d4c1812c839fcb252166aa0ea0bb467db9fec", "parents": [ "0b3f254028404b4772e02f9d1cdfcefba0e264b4", "5ed1a86d041a47017efa0ac527969c08963e0770" ], "author": { "name": "Andy Hung", "email": "hunga@google.com", "time": "Mon Aug 31 21:44:29 2020 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Aug 31 21:44:29 2020 +0000" }, "message": "Merge \"AudioMixer: Fix MONO_EXPAND for more than 2 channels\" into rvc-qpr-dev" }, { "commit": "a46b6d3ea608120af74ec7975427eb7f5311f720", "tree": "b106f7b2ed5a2850beea5fa0e7c69b0589489c0b", "parents": [ "bc430769e79481fa2841999565742230bf314870" ], "author": { "name": "Ytai Ben-Tsvi", "email": "ytai@google.com", "time": "Mon Aug 31 13:29:11 2020 -0700" }, "committer": { "name": "Ytai Ben-Tsvi", "email": "ytai@google.com", "time": "Mon Aug 31 13:35:04 2020 -0700" }, "message": "Fix segfault in capture state registration\n\nUsing \u0027this\u0027 from within the ctor of a RefBase is disallowed.\n\nFixes: 167242344\nTest: Rerun the failed tests referenced in the bug.\nChange-Id: I9737f245a2f735bdca1513beedcca93891af59b6\n" }, { "commit": "58fb14aa84f41329fccc7185701ffbf502f77114", "tree": "6e40f2c53934ba0246207e8be722204106f0a5d7", "parents": [ "579a5284be48aec4905160464716011cc7e89b9c" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Mon Aug 31 12:13:12 2020 -0700" }, "committer": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Mon Aug 31 12:16:26 2020 -0700" }, "message": "Fix file permissions to remove execute bit on ordinary files\n\nTest: N/A\nChange-Id: I9e85ebe5479ae7f021a69942630fc9c876d4116b\n" }, { "commit": "2e40c302d6117ec6eb65f25832a71488367b4dfb", "tree": "ce2cff004a09076114faabf595b1a116bcb461ff", "parents": [ "054de8d6440fd30238fa9330bcc038cda745b244", "924eccfd6f6d3aaed5db627a0bdcfcaaf9b09a18" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Aug 28 08:38:54 2020 -0700" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Aug 28 21:23:54 2020 -0700" }, "message": "Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)\n\nBug: 166295507\nMerged-In: Ie94127c1e981cb18671d5137ba0d39355d1353da\nChange-Id: Ib22ad33bda8d561af537499b6d31ab6134eeae02\n" }, { "commit": "717bc28fc5959c0edb2bbd86692ba5164893f719", "tree": "9f55d492e1032f4224dc3420345868cf8d613456", "parents": [ "0b3f254028404b4772e02f9d1cdfcefba0e264b4" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Fri Aug 21 17:10:39 2020 -0700" }, "committer": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Fri Aug 28 22:51:36 2020 +0000" }, "message": "audio flinger: handle race condition in AudioRecord creation\n\nA rare race condition can cause a failure to create an AudioRecord if\ntwo creation requests are processed concurrently and thread preemption happens\nat a specific time within the sequence between audioflinger and\naudio policy manager.\n\nThis CL implements a retry mechanism on client side when this particular failure\nis detected.\n\nBug: 161656190\nTest: Regression tests for audio capture use cases.\nTest: CTS tests for AudiRecord\nChange-Id: I155ee4899baeec21e10a1141cb9e323cbc8aa23b\n(cherry picked from commit d52a28ca2c19db7d10bc6c4639a8bd78e1afd5f1)\n" }, { "commit": "4fd7c513cbbb2f16cc651dc920cd4a1c0f8eea90", "tree": "8f3747d50877bec4d7cf061b5bbecca973635940", "parents": [ "bc430769e79481fa2841999565742230bf314870", "7f572c9b873b86d021056653a9f92887c7ae2ee6" ], "author": { "name": "Yin-Chia Yeh", "email": "yinchiayeh@google.com", "time": "Fri Aug 28 20:05:36 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Aug 28 20:05:36 2020 +0000" }, "message": "Camera: fix wrong signalStreamFlush call am: e75114727d am: ff30ed79d2 am: 7f572c9b87\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/12480929\n\nChange-Id: I83b0747dea40209109c15170550347a87db3c422\n" }, { "commit": "7f572c9b873b86d021056653a9f92887c7ae2ee6", "tree": "47e8e346f91e5149cfe3462776fc7fd24bd5619c", "parents": [ "60503f5c7e65b74e1c02726e91e7cc4c7126e8b9", "ff30ed79d2c4715e355824980c4978c066ebf177" ], "author": { "name": "Yin-Chia Yeh", "email": "yinchiayeh@google.com", "time": "Fri Aug 28 19:47:53 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Aug 28 19:47:53 2020 +0000" }, "message": "Camera: fix wrong signalStreamFlush call am: e75114727d am: ff30ed79d2\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/12480929\n\nChange-Id: I37304336195c5d053f1941c34e938d8c0b1473fc\n" }, { "commit": "ff30ed79d2c4715e355824980c4978c066ebf177", "tree": "38aeea79df0f997d00dec8dbdbff5b6badabf56c", "parents": [ "818e657599a6aa2b1bdfe0d16d98db37dca6ed7b", "e75114727d73502257ef503451453c6f85ded175" ], "author": { "name": "Yin-Chia Yeh", "email": "yinchiayeh@google.com", "time": "Fri Aug 28 19:24:10 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Aug 28 19:24:10 2020 +0000" }, "message": "Camera: fix wrong signalStreamFlush call am: e75114727d\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/12480929\n\nChange-Id: I57927fb97bad116b2f27d3f92e5085a5626d3262\n" }, { "commit": "bc430769e79481fa2841999565742230bf314870", "tree": "8f3747d50877bec4d7cf061b5bbecca973635940", "parents": [ "244e5086e3a9d1e4c37350abe0c4e4c09609eba7", "d9f8283b957dcd1fa78c86b503b0302689620323" ], "author": { "name": "Ytai Ben-tsvi", "email": "ytai@google.com", "time": "Fri Aug 28 16:50:48 2020 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Aug 28 16:50:48 2020 +0000" }, "message": "Merge \"Fix APS death notification\"" }, { "commit": "d9f8283b957dcd1fa78c86b503b0302689620323", "tree": "816fe36a2a42bd30b20eecfac2b1e6cde5cf9caf", "parents": [ "7c11c55958faf7fadcf0ec504c6679d8febcb158" ], "author": { "name": "Ytai Ben-Tsvi", "email": "ytai@google.com", "time": "Thu Aug 27 09:31:10 2020 -0700" }, "committer": { "name": "Ytai Ben-tsvi", "email": "ytai@google.com", "time": "Fri Aug 28 16:47:22 2020 +0000" }, "message": "Fix APS death notification\n\nOur death recipient object was being kept alive only by the reference\nheld by the remote process, the one we want the death notifications\nfrom. When it dies, we have a race condition between the death call\nand the listener being garbage collected.\n\nFurthermore, since the global APS reference may get replaced by a new\none as part of clearAudioConfigCache(), we keep the old reference\naround, or else our death listener becomes invalidated silently.\n\nFixes: 165780067\nTest: Manual verification of sound trigger recovery after killing\n audioserver multiple times, while generating touch sounds.\nChange-Id: If24c59ec3e3d01f418fbf575b8cc32ae0ba7fa2e\n" }, { "commit": "e75114727d73502257ef503451453c6f85ded175", "tree": "e440b3f5a2e0b7663bb16d4c197c8b9a85079fb6", "parents": [ "1a342950d36668c89c7f72488a478506849c3370" ], "author": { "name": "Yin-Chia Yeh", "email": "yinchiayeh@google.com", "time": "Tue Jul 28 00:17:58 2020 -0700" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Aug 28 15:36:33 2020 +0000" }, "message": "Camera: fix wrong signalStreamFlush call\n\nSometimes the waitUntilIdle call will finish without RequestThread\nsending the signalStreamFlush call down to HAL.\nReset the flag when the wait finishes to avoid a wrong call fired\nlater when the request thread goes to paused.\n\nTest: CTS on Pixel 3, partner testing\nBug: 162062652\nChange-Id: I7c6674860a688f0bc42d4083793514b546cbd65d\n(cherry picked from commit e52b8fa8fabd74555dd1ebb2e9405460a545a919)\n" }, { "commit": "032f7a122fd4a778147dc348b1954ac7dc112a84", "tree": "39cc9c219e1d6faae697932bb0310ab6f69efb8a", "parents": [ "d82fd8a9ec4fa873c4f298d71181eb12bfdb2f75" ], "author": { "name": "Alex Zhang", "email": "difan@google.com", "time": "Fri Apr 17 16:08:24 2020 -0700" }, "committer": { "name": "Alex Zhang", "email": "difan@google.com", "time": "Thu Aug 27 15:31:22 2020 -0700" }, "message": "Allow graceful degradation of MediaProfile with broken configuration.\n\nCurrently, when media profile declares something unsupported / broken /\nmissing, MediaProfile will crash. This patch will change the behavior\nto gracefully degradation instead. b/147701370 is an example IRL. If\nvendor declares profile unsupported in AOSP, GSI image will crash\ninstead of having a non-working or suboptimally working camera.\n\nTest: Compiles\nBug: 166673022\n\nSigned-off-by: Alex Zhang \u003cdifan@google.com\u003e\nChange-Id: Icc0f85fe0aac748be4d4f7dd94814f615d528a03\n" }, { "commit": "244e5086e3a9d1e4c37350abe0c4e4c09609eba7", "tree": "a2f91436efd8587def9e765d333387fed6a03b7f", "parents": [ "b8a9dbbf791adf7f1a0ab87d7a35770074e88cc8", "60503f5c7e65b74e1c02726e91e7cc4c7126e8b9" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Thu Aug 27 07:10:01 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Aug 27 07:10:01 2020 +0000" }, "message": "[automerger skipped] Merge \"Let mediaserver use CleanupMode::CLEAN_ALL mode for RenderEngine\" into rvc-qpr-dev am: 0b3f254028 -s ours am: 60503f5c7e -s ours\n\nam skip reason: Change-Id Idcb008600aab81a46eef4405ad9d52382e5dd810 with SHA-1 6b6ed95751 is in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/12447607\n\nChange-Id: I05ab565347b33ba6529efdf13ec8782d96b0d995\n" }, { "commit": "b8a9dbbf791adf7f1a0ab87d7a35770074e88cc8", "tree": "a2f91436efd8587def9e765d333387fed6a03b7f", "parents": [ "763136770b0bb6828cf7628a9b3bbf09b0741ae2" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Thu Aug 27 04:12:26 2020 +0000" }, "committer": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Thu Aug 27 04:12:26 2020 +0000" }, "message": "Revert \"Snap for 6793014 from 424180bdc4aa18249e678daebfd0fcf936...\"\n\nRevert \"Snap for 6793014 from fd1ad6750ef332d3f50f218f4d5d148e6e...\"\n\nRevert \"Snap for 6793014 from 7594ec6384c4da320726def34f477736f9...\"\n\nRevert \"Snap for 6793014 from bbbccc3c2b7fc7c5780f6c415c4223e1d0...\"\n\nRevert \"Snap for 6793014 from 44725f06b7f7d6407b5ee82d989bdd6c7a...\"\n\nRevert \"Snap for 6793014 from f22ad3164937a8f2e309965c102b6366d5...\"\n\nRevert \"Snap for 6793014 from 11467102abddb6026aaa164c1361439c2d...\"\n\nRevert \"Snap for 6793014 from 265280bf5cb4bc14e132c3a35ae5f7ae65...\"\n\nRevert \"Snap for 6793014 from f2989f9c65556d5155dbd57f82f0c93a16...\"\n\nRevert \"Snap for 6793014 from 8b8bf0a07b0521bbe8483fbbab1222ffd6...\"\n\nRevert \"Snap for 6793014 from 3777d883a3857b1a1589181c436d9018d7...\"\n\nRevert \"Snap for 6793014 from 3157b4ee4325286f0c2ab0f26528460c8b...\"\n\nRevert \"Snap for 6793014 from a43295d1825da62af038d345a7a861ed7a...\"\n\nRevert \"Snap for 6793014 from 2076be4d27078d6ebc0a6b5e5ceb386109...\"\n\nRevert \"Snap for 6793014 from d0e31526c62b2aeb35c293ac96feb180fc...\"\n\nRevert \"Snap for 6793014 from 7a3a8c6351d5167a6ae0b33bc376efabd2...\"\n\nRevert \"Snap for 6793014 from 41471cb21bb16b5c3bcc92f84293b79684...\"\n\nRevert \"Snap for 6793014 from 42e5cca3cfb829690c9d8c6aca57a8e7d5...\"\n\nRevert \"Snap for 6793014 from 4f81304963d19f4511b1e8e7d0aad87a67...\"\n\nRevert \"Snap for 6793014 from 07602cdacf5bcc835db41f7eaa24af9964...\"\n\nRevert \"Snap for 6793014 from 14cb57e107a3abce8b14937b1f92c28d18...\"\n\nRevert \"Snap for 6793014 from ab1e4a81d09a540a5f927059e5bc03a606...\"\n\nRevert \"Snap for 6793014 from 8c65adad0bcdfb3acc561063b4048dca24...\"\n\nRevert \"Snap for 6793014 from b3061942700265e2bf04af9997775dcbbb...\"\n\nRevert \"Snap for 6793014 from 551c5953fc62e339e4ee884ec2cd0ac3be...\"\n\nRevert \"Snap for 6793014 from 4919273b2ac5c6347a18e17c5ec70d8da6...\"\n\nRevert \"Snap for 6793014 from 988d4244914e0c749655e8cb6db18ba44f...\"\n\nRevert submission 12465146-release-request-6b259cbc-1f45-4b05-bc7e-c9b893b79d68-for-git_main-busytown-release-6793014\n\nReason for revert: b/166531456\nReverted Changes:\nI5ff7a6c0d:Snap for 6793014 from f2989f9c65556d5155dbd57f82f0...\nI77bdff943:Snap for 6793014 from a43295d1825da62af038d345a7a8...\nI2ac5c520a:Snap for 6793014 from c3f124cca05579acf0a6cb589ebd...\nI023b9702f:Snap for 6793014 from 98756d6d3e2bb0ba28eb125caa7a...\nIbc7893d72:Snap for 6793014 from fd1ad6750ef332d3f50f218f4d5d...\nIc27847bee:Snap for 6793014 from 8c65adad0bcdfb3acc561063b404...\nIf20bc9352:Snap for 6793014 from 7a3a8c6351d5167a6ae0b33bc376...\nI6542d17e8:Snap for 6793014 from 3777d883a3857b1a1589181c436d...\nI66e6bb8a9:Snap for 6793014 from 8b8bf0a07b0521bbe8483fbbab12...\nI3cd190b6b:Snap for 6793014 from 424180bdc4aa18249e678daebfd0...\nIf92db7402:Snap for 6793014 from ab1e4a81d09a540a5f927059e5bc...\nIaced03c87:Snap for 6793014 from d0e31526c62b2aeb35c293ac96fe...\nI5d28c6b4b:Snap for 6793014 from 4f81304963d19f4511b1e8e7d0aa...\nI30d07bea3:Snap for 6793014 from 7594ec6384c4da320726def34f47...\nI473205f48:Snap for 6793014 from 551c5953fc62e339e4ee884ec2cd...\nI0656b41af:Snap for 6793014 from 44725f06b7f7d6407b5ee82d989b...\nI0f9796067:Snap for 6793014 from 4919273b2ac5c6347a18e17c5ec7...\nI9a38cda8f:Snap for 6793014 from 2076be4d27078d6ebc0a6b5e5ceb...\nI876a82f51:Snap for 6793014 from 11467102abddb6026aaa164c1361...\nI749d7d023:Snap for 6793014 from 41471cb21bb16b5c3bcc92f84293...\nI038daea41:Snap for 6793014 from 07602cdacf5bcc835db41f7eaa24...\nI47aa3131c:Snap for 6793014 from 14cb57e107a3abce8b14937b1f92...\nI32dba8a95:Snap for 6793014 from 3157b4ee4325286f0c2ab0f26528...\nI2ebc9f9db:Snap for 6793014 from 988d4244914e0c749655e8cb6db1...\nIae7c3370f:Snap for 6793014 from 9ffb8852294e06e2d387dc1fb868...\nI6467a7f1b:Snap for 6793014 from 42e5cca3cfb829690c9d8c6aca57...\nI8c6375203:Snap for 6793014 from b3061942700265e2bf04af999777...\nI843b2e1f3:Snap for 6793014 from 265280bf5cb4bc14e132c3a35ae5...\nIe254f7079:Snap for 6793014 from f22ad3164937a8f2e309965c102b...\nI01e0974ed:Snap for 6793014 from bbbccc3c2b7fc7c5780f6c415c42...\n\nChange-Id: I00c786b898b73e58db8bcb1dd0cf3fdaa1ae3038\n" }, { "commit": "763136770b0bb6828cf7628a9b3bbf09b0741ae2", "tree": "f6b5f1867d7b925dc7ac5ae37aa5a10079cc00dd", "parents": [ "1f5d1cfc921981ef0a054c75d01c2b1c9a70f6e7", "424180bdc4aa18249e678daebfd0fcf9365f6e5d" ], "author": { "name": "android-build-team Robot", "email": "android-build-team-robot@google.com", "time": "Thu Aug 27 00:39:29 2020 +0000" }, "committer": { "name": "android-build-team Robot", "email": "android-build-team-robot@google.com", "time": "Thu Aug 27 00:39:29 2020 +0000" }, "message": "Snap for 6793014 from 424180bdc4aa18249e678daebfd0fcf9365f6e5d to master\n\nChange-Id: I3cd190b6b7831aae29c3b0ff5bd9a4ce2e6ba845\n" }, { "commit": "1f5d1cfc921981ef0a054c75d01c2b1c9a70f6e7", "tree": "a2f91436efd8587def9e765d333387fed6a03b7f", "parents": [ "8d9ba8115221f17e4ef99f6dc4426a3d8dd8763b", "61862378bfd00756850d8d5918c03731b5631ee2" ], "author": { "name": "Jayant Chowdhary", "email": "jchowdhary@google.com", "time": "Wed Aug 26 23:33:48 2020 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Aug 26 23:33:48 2020 +0000" }, "message": "Merge \"Move session configuration util methods CameraDeviceClient-\u003eSessionConfigurationUtils.\"" }, { "commit": "8d9ba8115221f17e4ef99f6dc4426a3d8dd8763b", "tree": "a3ca7617f9740276536f0f93b3fa47dacae0da99", "parents": [ "3bab4aade6bc835aba247031f2a73a3ed61a3fd8", "09a959249c1a1ebe5a30c9a4c526e1146b9219ce" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Wed Aug 26 20:51:29 2020 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Aug 26 20:51:29 2020 +0000" }, "message": "Merge \"Add package name when creating AudioTrack.\"" }, { "commit": "3bab4aade6bc835aba247031f2a73a3ed61a3fd8", "tree": "9efdc973865ebd7b02bc8fa638b7bba95ffe6a56", "parents": [ "424180bdc4aa18249e678daebfd0fcf9365f6e5d", "267afb19b175542d6b867cdd179222a41223dee2" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Wed Aug 26 20:05:29 2020 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Aug 26 20:05:29 2020 +0000" }, "message": "Merge \"aaudio: do not force legacy burst to callback size\"" }, { "commit": "60503f5c7e65b74e1c02726e91e7cc4c7126e8b9", "tree": "47e8e346f91e5149cfe3462776fc7fd24bd5619c", "parents": [ "03a13e10bb18da91f2788744e9708fa9c00553af", "0b3f254028404b4772e02f9d1cdfcefba0e264b4" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Wed Aug 26 18:53:01 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Aug 26 18:53:01 2020 +0000" }, "message": "[automerger skipped] Merge \"Let mediaserver use CleanupMode::CLEAN_ALL mode for RenderEngine\" into rvc-qpr-dev am: 0b3f254028 -s ours\n\nam skip reason: Change-Id Idcb008600aab81a46eef4405ad9d52382e5dd810 with SHA-1 6b6ed95751 is in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/12447607\n\nChange-Id: I2a8a540338a882ee8facd3470e6be4ae4a05cf4b\n" }, { "commit": "424180bdc4aa18249e678daebfd0fcf9365f6e5d", "tree": "f6b5f1867d7b925dc7ac5ae37aa5a10079cc00dd", "parents": [ "23ce7b3d59464fe1f89513a1cc3519cefea49351", "03a13e10bb18da91f2788744e9708fa9c00553af" ], "author": { "name": "Alec Mouri", "email": "alecmouri@google.com", "time": "Wed Aug 26 18:34:06 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Aug 26 18:34:06 2020 +0000" }, "message": "[automerger skipped] Merge \"Let mediaserver use CleanupMode::CLEAN_ALL mode for RenderEngine\" into rvc-qpr-dev-plus-aosp am: 03a13e10bb -s ours\n\nam skip reason: Change-Id Idcb008600aab81a46eef4405ad9d52382e5dd810 with SHA-1 50a1b358b4 is in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/12452734\n\nChange-Id: I0b8e8b05e90b07601868682e18be97b87c2e5b6b\n" }, { "commit": "0b3f254028404b4772e02f9d1cdfcefba0e264b4", "tree": "f8204c97ce7d9cdd020c6cf2e20817a2ce0955b2", "parents": [ "3d3f63925734e088f768eb86ef1425c68a567e72", "af570c49ed6accf1bc84612b53af9023991536fc" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Wed Aug 26 18:32:28 2020 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Aug 26 18:32:28 2020 +0000" }, "message": "Merge \"Let mediaserver use CleanupMode::CLEAN_ALL mode for RenderEngine\" into rvc-qpr-dev" }, { "commit": "09a959249c1a1ebe5a30c9a4c526e1146b9219ce", "tree": "881583cb0d540929ad35907bc5f36454bbc1622a", "parents": [ "4a603cd0594d22d1a3a2bae5bb22009343d4b5bb" ], "author": { "name": "jiabin", "email": "jiabin@google.com", "time": "Fri Aug 21 18:14:43 2020 -0700" }, "committer": { "name": "jiabin", "email": "jiabin@google.com", "time": "Wed Aug 26 11:18:20 2020 -0700" }, "message": "Add package name when creating AudioTrack.\n\nThe package name can be used when starting an external vibration, which\nis used by vibrator service to check if the application has the\npermission to start vibration.\n\nBug: 165910728\nBug: 162343845\nTest: atest AudioTrackTest MediaPlayerTest\nTest: start audio-coupled-haptic playback\nChange-Id: I6d12c4e141c037ee94ee79cbb9bf537421ec9507\n" }, { "commit": "23ce7b3d59464fe1f89513a1cc3519cefea49351", "tree": "f6b5f1867d7b925dc7ac5ae37aa5a10079cc00dd", "parents": [ "0627dbff3eacb079fa86f387338a2808f768139e", "d52a28ca2c19db7d10bc6c4639a8bd78e1afd5f1" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Wed Aug 26 17:53:48 2020 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Aug 26 17:53:48 2020 +0000" }, "message": "Merge \"audio flinger: handle race condition in AudioRecord creation\"" }, { "commit": "03a13e10bb18da91f2788744e9708fa9c00553af", "tree": "47e8e346f91e5149cfe3462776fc7fd24bd5619c", "parents": [ "3f6e4cc3b113ebbb0e790f3bfda9d48dabe73aa6", "6b6ed9575108221b4557ce3a5f97ad16cb2c654a" ], "author": { "name": "Alec Mouri", "email": "alecmouri@google.com", "time": "Wed Aug 26 17:51:32 2020 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Aug 26 17:51:32 2020 +0000" }, "message": "Merge \"Let mediaserver use CleanupMode::CLEAN_ALL mode for RenderEngine\" into rvc-qpr-dev-plus-aosp" }, { "commit": "0627dbff3eacb079fa86f387338a2808f768139e", "tree": "04536a47dcd4d1af62c5f9b3124ac9dc92bede5d", "parents": [ "7636217f0531c64424c81f60f733b40295d8cddc" ], "author": { "name": "hkuang", "email": "hkuang@google.com", "time": "Tue Aug 25 13:53:56 2020 -0700" }, "committer": { "name": "Hangyu Kuang", "email": "hkuang@google.com", "time": "Wed Aug 26 04:13:24 2020 +0000" }, "message": "transcoding: Rework AIDL files to expose to frameworks/base\n\nBug: 160260102\nTest: Unit test\nChange-Id: Ib2050becaf89b8e4db5867bc601dedeb4eb8ebd2\n" }, { "commit": "7636217f0531c64424c81f60f733b40295d8cddc", "tree": "39dde1365cc39a41fc822cfe0409c8cd2bca665b", "parents": [ "9a6115fe143db97410f077385368cbc5f72a4b14", "3f6e4cc3b113ebbb0e790f3bfda9d48dabe73aa6" ], "author": { "name": "Ray Essick", "email": "essick@google.com", "time": "Wed Aug 26 02:59:17 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Aug 26 02:59:17 2020 +0000" }, "message": "Merge \"Provide a common OWNERS for all codecs\" am: 579a5284be am: 054de8d644 am: 1a342950d3 am: 818e657599 am: 3f6e4cc3b1\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1393597\n\nChange-Id: I7f21bc0fed4633a2daad3601a2b326c0c5749a5e\n" }, { "commit": "9a6115fe143db97410f077385368cbc5f72a4b14", "tree": "ca535afd4a7c0d4aec809785cfde78c28bb51b1e", "parents": [ "fa529dabda97e4c98bd4b1d017a11e213924bcc9", "23a20b0e7dbfd29f76ad25c6438790f0249fc9a6" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Wed Aug 26 02:58:56 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Aug 26 02:58:56 2020 +0000" }, "message": "Merge \"Initialize an uninitialized enum.\" am: 26537884e4 am: ddca6226f9 am: ddc5686e68 am: ed883a6cb6 am: 23a20b0e7d\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1406567\n\nChange-Id: I9e6993ba484f843882f22b889df684ecbc2d3ccd\n" }, { "commit": "fa529dabda97e4c98bd4b1d017a11e213924bcc9", "tree": "abe95ac9a5e74d7b14e31f81370e08ae6556f06e", "parents": [ "758fc616eda23e40ca8d70c0b785f900f70f9280", "ba604618fd83df535007ef9f351286cd215d12a0" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Wed Aug 26 02:54:21 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Aug 26 02:54:21 2020 +0000" }, "message": "[automerger skipped] Merge \"Merge stage branch to development trunk.\" am: 512ee5976e -s ours am: a6d107c011 -s ours am: de1759dd87 -s ours am: bf4bfb188d -s ours am: ba604618fd -s ours\n\nam skip reason: Change-Id I869b8567bbccfef1ccad01f47cdf5138935b6996 with SHA-1 ba8fee2a1d is in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1409196\n\nChange-Id: Icc6354eac973d94c7b7e36d01a79ddf2a074bdef\n" }, { "commit": "3f6e4cc3b113ebbb0e790f3bfda9d48dabe73aa6", "tree": "db14b18c97d9eb38c31121aeb1fe7f1ea4fb0e2d", "parents": [ "23a20b0e7dbfd29f76ad25c6438790f0249fc9a6", "818e657599a6aa2b1bdfe0d16d98db37dca6ed7b" ], "author": { "name": "Ray Essick", "email": "essick@google.com", "time": "Wed Aug 26 02:37:46 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Aug 26 02:37:46 2020 +0000" }, "message": "Merge \"Provide a common OWNERS for all codecs\" am: 579a5284be am: 054de8d644 am: 1a342950d3 am: 818e657599\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1393597\n\nChange-Id: I5beb8e0d1c5bbcbbaca262bd7ddfe8df18255294\n" }, { "commit": "23a20b0e7dbfd29f76ad25c6438790f0249fc9a6", "tree": "6f7d9bcda58e00528dada9c09a3e93150fdb61e2", "parents": [ "ba604618fd83df535007ef9f351286cd215d12a0", "ed883a6cb6c55e52832ef6b7c2da11e7ab693b97" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Wed Aug 26 02:34:42 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Aug 26 02:34:42 2020 +0000" }, "message": "Merge \"Initialize an uninitialized enum.\" am: 26537884e4 am: ddca6226f9 am: ddc5686e68 am: ed883a6cb6\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1406567\n\nChange-Id: Ifecaaf97505c894e6bcbb43e46cf81db2c893965\n" }, { "commit": "ba604618fd83df535007ef9f351286cd215d12a0", "tree": "a83cde48426283e10c84e3945337b9a541600c2f", "parents": [ "a754acd517eb111921c136f3c920366b9215857f", "bf4bfb188d7045fa60f4f802cb6b90377c4774ad" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Wed Aug 26 02:33:09 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Aug 26 02:33:09 2020 +0000" }, "message": "[automerger skipped] Merge \"Merge stage branch to development trunk.\" am: 512ee5976e -s ours am: a6d107c011 -s ours am: de1759dd87 -s ours am: bf4bfb188d -s ours\n\nam skip reason: Change-Id I869b8567bbccfef1ccad01f47cdf5138935b6996 with SHA-1 ba8fee2a1d is in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1409196\n\nChange-Id: Icefaa091a875fc34f8d0fbbcb1ecf5cfaaaa3b0d\n" }, { "commit": "818e657599a6aa2b1bdfe0d16d98db37dca6ed7b", "tree": "a80a2325aebe29ef26515c54f7779cd72d6a3d33", "parents": [ "ed883a6cb6c55e52832ef6b7c2da11e7ab693b97", "1a342950d36668c89c7f72488a478506849c3370" ], "author": { "name": "Ray Essick", "email": "essick@google.com", "time": "Wed Aug 26 02:14:56 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Aug 26 02:14:56 2020 +0000" }, "message": "Merge \"Provide a common OWNERS for all codecs\" am: 579a5284be am: 054de8d644 am: 1a342950d3\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1393597\n\nChange-Id: Id3d77a9fd97909aa9a1d6b3fc7286ad2813f2595\n" }, { "commit": "ed883a6cb6c55e52832ef6b7c2da11e7ab693b97", "tree": "002b13ff48fb56103ac24e758c71ed8ef0c36836", "parents": [ "bf4bfb188d7045fa60f4f802cb6b90377c4774ad", "ddc5686e6856a6346e36330a8a13361bc053bb14" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Wed Aug 26 02:13:55 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Aug 26 02:13:55 2020 +0000" }, "message": "Merge \"Initialize an uninitialized enum.\" am: 26537884e4 am: ddca6226f9 am: ddc5686e68\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1406567\n\nChange-Id: I67779b2fdd80553c99a371fc95d5771ea41e08f7\n" }, { "commit": "bf4bfb188d7045fa60f4f802cb6b90377c4774ad", "tree": "3360232b0ee1e866f0317d64ba878f1c5519278b", "parents": [ "3390336393da860e2fbdcddaf9af1724c6877ec9", "de1759dd87db4f0966a93ec96d1be6d6476dcacd" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Wed Aug 26 02:11:31 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Aug 26 02:11:31 2020 +0000" }, "message": "[automerger skipped] Merge \"Merge stage branch to development trunk.\" am: 512ee5976e -s ours am: a6d107c011 -s ours am: de1759dd87 -s ours\n\nam skip reason: Change-Id I869b8567bbccfef1ccad01f47cdf5138935b6996 with SHA-1 ba8fee2a1d is in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1409196\n\nChange-Id: I4d3625c6cc5332b74eca2e62acef3f0e632c5275\n" }, { "commit": "6b6ed9575108221b4557ce3a5f97ad16cb2c654a", "tree": "0caf3008c200ca89d30f8249c50587028b9f5408", "parents": [ "a754acd517eb111921c136f3c920366b9215857f" ], "author": { "name": "Alec Mouri", "email": "alecmouri@google.com", "time": "Thu Aug 13 10:27:41 2020 -0700" }, "committer": { "name": "Alec Mouri", "email": "alecmouri@google.com", "time": "Wed Aug 26 02:11:29 2020 +0000" }, "message": "Let mediaserver use CleanupMode::CLEAN_ALL mode for RenderEngine\n\nThis mode for cleanupPostRender:\n* Destroys the underlying image cache, so the expicit unbind() call\nisn\u0027t needed.\n* Rebinds texture memory to a placeholder buffer, so the driver won\u0027t\nkeep a buffer around.\n\nBug: 162202251\nTest: Launch custom apk with thumbnail generation\nTest: adb shell dumpsys meminfo mediaserver\nChange-Id: Idcb008600aab81a46eef4405ad9d52382e5dd810\nMerged-In: Idcb008600aab81a46eef4405ad9d52382e5dd810\n" }, { "commit": "758fc616eda23e40ca8d70c0b785f900f70f9280", "tree": "abe95ac9a5e74d7b14e31f81370e08ae6556f06e", "parents": [ "b06318a68c4e3a4e5c4a2941ac39a1bc1a0ee186", "6233fed6f67703460d4bd0b025bacc03513f1284" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Wed Aug 26 01:44:01 2020 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Aug 26 01:44:01 2020 +0000" }, "message": "Merge \"Transcoder: Improve AV transcoding speed by enforcing sequential sample access.\"" }, { "commit": "1a342950d36668c89c7f72488a478506849c3370", "tree": "b98122d09aa17207e8994f2dbd101c084a5fc103", "parents": [ "ddc5686e6856a6346e36330a8a13361bc053bb14", "054de8d6440fd30238fa9330bcc038cda745b244" ], "author": { "name": "Ray Essick", "email": "essick@google.com", "time": "Wed Aug 26 00:38:15 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Aug 26 00:38:15 2020 +0000" }, "message": "Merge \"Provide a common OWNERS for all codecs\" am: 579a5284be am: 054de8d644\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1393597\n\nChange-Id: I882f69fd9856380b08bae6cfabba7734aa76e7e7\n" }, { "commit": "ddc5686e6856a6346e36330a8a13361bc053bb14", "tree": "135d1c043980e0bce0250cb9611471fd71821027", "parents": [ "de1759dd87db4f0966a93ec96d1be6d6476dcacd", "ddca6226f9f57d8ab90183eb881e40221a69cb27" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Wed Aug 26 00:37:42 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Aug 26 00:37:42 2020 +0000" }, "message": "Merge \"Initialize an uninitialized enum.\" am: 26537884e4 am: ddca6226f9\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1406567\n\nChange-Id: Iaee353f995395ae2ea4a50fe6c37d6e52def2876\n" }, { "commit": "de1759dd87db4f0966a93ec96d1be6d6476dcacd", "tree": "1a3e1d74817e4b695927fa4b1a7e021aa4d75e73", "parents": [ "50af31ba90045e7a1d97c2a3abfe8affd856e095", "a6d107c011ede2daacca0a5170a14958a9376d2d" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Wed Aug 26 00:34:34 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Aug 26 00:34:34 2020 +0000" }, "message": "[automerger skipped] Merge \"Merge stage branch to development trunk.\" am: 512ee5976e -s ours am: a6d107c011 -s ours\n\nam skip reason: Change-Id I869b8567bbccfef1ccad01f47cdf5138935b6996 with SHA-1 ba8fee2a1d is in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1409196\n\nChange-Id: Id067e173a5c82298b8764c426c7f72054fa79da5\n" }, { "commit": "6233fed6f67703460d4bd0b025bacc03513f1284", "tree": "abee276ae4e2063782144adfc36c96a37576cafd", "parents": [ "615364792b6fe07869c685e4bccbf7837e1ba97b" ], "author": { "name": "Linus Nilsson", "email": "lnilsson@google.com", "time": "Thu Aug 13 15:15:14 2020 -0700" }, "committer": { "name": "Linus Nilsson", "email": "lnilsson@google.com", "time": "Tue Aug 25 16:47:59 2020 -0700" }, "message": "Transcoder: Improve AV transcoding speed by enforcing sequential sample access.\n\nMediaSampleReader was bottlenecking the transcoding pipeline due to\nnon-sequential sample access. This commit adds an option to the sample\nreader to enforce sequential sample access by blocking reads until\nthe underlying extractor advances to that specific track.\nFollow-up: b/165374867 Make MediaSampleWriter robust against buffering track transcoders\n\nFixes: 160268606\nTest: Transcoder unit tests, and benchmark tests.\nChange-Id: Id2a363d06df927ea3e547462c52803594e0511e1\n" }, { "commit": "b06318a68c4e3a4e5c4a2941ac39a1bc1a0ee186", "tree": "239ff95c0746ab72925685bd17d7eea6fef8f104", "parents": [ "36188476951af76561327ae4575c92d7dbb5cb65", "0ec234e0529d9fb546aef71f0fedf7d29fce0030" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Tue Aug 25 23:11:28 2020 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Aug 25 23:11:28 2020 +0000" }, "message": "Merge \"Camera: Extend vendor tag helper methods\"" }, { "commit": "36188476951af76561327ae4575c92d7dbb5cb65", "tree": "efb71cafc5c18cb9bddeda18b27fe182271d2793", "parents": [ "615364792b6fe07869c685e4bccbf7837e1ba97b", "a754acd517eb111921c136f3c920366b9215857f" ], "author": { "name": "James Zern", "email": "jzern@google.com", "time": "Tue Aug 25 21:22:11 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Aug 25 21:22:11 2020 +0000" }, "message": "[automerger skipped] Merge \"C2SoftGav1Dec: sync copyOutput*() w/other codecs\" into rvc-qpr-dev am: 3d3f639257 -s ours am: a754acd517 -s ours\n\nam skip reason: Change-Id Ib8b283a0fb4bacb9b4f561d83b4d38727a3116d4 with SHA-1 ac19c3d2d1 is in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/12402584\n\nChange-Id: I4e61ad551d1393394293b6e08eb6e60e3aa06d08\n" }, { "commit": "a754acd517eb111921c136f3c920366b9215857f", "tree": "a83cde48426283e10c84e3945337b9a541600c2f", "parents": [ "5a7830ff2727e0f62fb824d216b4992af71c7d12", "3d3f63925734e088f768eb86ef1425c68a567e72" ], "author": { "name": "James Zern", "email": "jzern@google.com", "time": "Tue Aug 25 21:08:32 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Aug 25 21:08:32 2020 +0000" }, "message": "[automerger skipped] Merge \"C2SoftGav1Dec: sync copyOutput*() w/other codecs\" into rvc-qpr-dev am: 3d3f639257 -s ours\n\nam skip reason: Change-Id Ib8b283a0fb4bacb9b4f561d83b4d38727a3116d4 with SHA-1 ac19c3d2d1 is in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/12402584\n\nChange-Id: Iaa23a77865bf949707620b0caa4233fb054235a1\n" }, { "commit": "3d3f63925734e088f768eb86ef1425c68a567e72", "tree": "6f5432062ed919d5f9a37353da57ac5d9d36cdeb", "parents": [ "3e2bdbcf897baca27f3798b25f62873035f41ed1", "ddbbf5591c7a7bd1facedf0f429ac908d15e083a" ], "author": { "name": "James Zern", "email": "jzern@google.com", "time": "Tue Aug 25 20:57:20 2020 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Aug 25 20:57:20 2020 +0000" }, "message": "Merge \"C2SoftGav1Dec: sync copyOutput*() w/other codecs\" into rvc-qpr-dev" }, { "commit": "d52a28ca2c19db7d10bc6c4639a8bd78e1afd5f1", "tree": "c687eda00e2c45823cdb1857c64ad48b67578819", "parents": [ "615364792b6fe07869c685e4bccbf7837e1ba97b" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Fri Aug 21 17:10:39 2020 -0700" }, "committer": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Tue Aug 25 13:33:12 2020 -0700" }, "message": "audio flinger: handle race condition in AudioRecord creation\n\nA rare race condition can cause a failure to create an AudioRecord if\ntwo creation requests are processed concurrently and thread preemption happens\nat a specific time within the sequence between audioflinger and\naudio policy manager.\n\nThis CL implements a retry mechanism on client side when this particular failure\nis detected.\n\nBug: 161656190\nTest: Regression tests for audio capture use cases.\nTest: CTS tests for AudiRecord\nChange-Id: I155ee4899baeec21e10a1141cb9e323cbc8aa23b\n" }, { "commit": "054de8d6440fd30238fa9330bcc038cda745b244", "tree": "35ee64cc73f3e2881dcff82da2b7d4c675cb3c3b", "parents": [ "ddca6226f9f57d8ab90183eb881e40221a69cb27", "579a5284be48aec4905160464716011cc7e89b9c" ], "author": { "name": "Ray Essick", "email": "essick@google.com", "time": "Tue Aug 25 20:16:18 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Aug 25 20:16:18 2020 +0000" }, "message": "Merge \"Provide a common OWNERS for all codecs\" am: 579a5284be\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1393597\n\nChange-Id: I7b09554cdcdda5178e28e8d0f24ee8f474d42f0d\n" }, { "commit": "579a5284be48aec4905160464716011cc7e89b9c", "tree": "c897ced5668a44d28d5218461f2bdd401928e4b0", "parents": [ "26537884e4fe97e053c3b14ad8da5b2dad4dc057", "9cfe23aa64fdaa1e941101166f7a5975244ceb47" ], "author": { "name": "Ray Essick", "email": "essick@google.com", "time": "Tue Aug 25 19:34:23 2020 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Tue Aug 25 19:34:23 2020 +0000" }, "message": "Merge \"Provide a common OWNERS for all codecs\"" }, { "commit": "61862378bfd00756850d8d5918c03731b5631ee2", "tree": "30456f18c36da196d693c556f326a54b42d01245", "parents": [ "6b5fdb53573f08258392cc60ff167fc90b553363" ], "author": { "name": "Jayant Chowdhary", "email": "jchowdhary@google.com", "time": "Thu Aug 20 09:50:01 2020 -0700" }, "committer": { "name": "Jayant Chowdhary", "email": "jchowdhary@google.com", "time": "Tue Aug 25 12:03:18 2020 -0700" }, "message": "Move session configuration util methods CameraDeviceClient-\u003eSessionConfigurationUtils.\n\nBug: 148329298\n\nTest: builds\nTest: Camera CTS has no new failures\n\nChange-Id: I462d2a9162cc4371648f85b2622cc764f36d560e\nSigned-off-by: Jayant Chowdhary \u003cjchowdhary@google.com\u003e\n" }, { "commit": "af570c49ed6accf1bc84612b53af9023991536fc", "tree": "de3fce2fd50c6d62d3dc5d3a100c7ca70814c088", "parents": [ "3e2bdbcf897baca27f3798b25f62873035f41ed1" ], "author": { "name": "Alec Mouri", "email": "alecmouri@google.com", "time": "Thu Aug 13 10:27:41 2020 -0700" }, "committer": { "name": "Alec Mouri", "email": "alecmouri@google.com", "time": "Tue Aug 25 18:17:04 2020 +0000" }, "message": "Let mediaserver use CleanupMode::CLEAN_ALL mode for RenderEngine\n\nThis mode for cleanupPostRender:\n* Destroys the underlying image cache, so the expicit unbind() call\nisn\u0027t needed.\n* Rebinds texture memory to a placeholder buffer, so the driver won\u0027t\nkeep a buffer around.\n\nBug: 162202251\nTest: Launch custom apk with thumbnail generation\nTest: adb shell dumpsys meminfo mediaserver\nChange-Id: Idcb008600aab81a46eef4405ad9d52382e5dd810\nMerged-In: Idcb008600aab81a46eef4405ad9d52382e5dd810\n" }, { "commit": "dddc2aef4e5f9f27a79909f475c31c96eb688200", "tree": "40d78318ee59cb23fa5cfbd53fdff57035fe8b32", "parents": [ "4a603cd0594d22d1a3a2bae5bb22009343d4b5bb" ], "author": { "name": "jiabin", "email": "jiabin@google.com", "time": "Wed Aug 19 11:20:48 2020 -0700" }, "committer": { "name": "jiabin", "email": "jiabin@google.com", "time": "Tue Aug 25 09:42:58 2020 -0700" }, "message": "Support device role for capture preset.\n\nSupport set/add/remove/clear/get device role for capture preset. The\ndevice role can be DEVICE_ROLE_PREFERRED and DEVICE_ROLE_DISABLED. The\npreferred and disabled devices can be multiple devices. In this CL,\nonly cache preferred devices in engine but not use for audio routing.\n\nBug: 160352965\nTest: atest AudioServiceHostTest\nTest: atest audiopolicy_tests\nChange-Id: Ib16ab2ec82bc288421c20df9470ac3835c71b1e8\n" }, { "commit": "ddca6226f9f57d8ab90183eb881e40221a69cb27", "tree": "a6c564eb3bbac9bc4e9b61b7ae5ce87bf3ef0518", "parents": [ "a6d107c011ede2daacca0a5170a14958a9376d2d", "26537884e4fe97e053c3b14ad8da5b2dad4dc057" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Tue Aug 25 09:40:45 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Aug 25 09:40:45 2020 +0000" }, "message": "Merge \"Initialize an uninitialized enum.\" am: 26537884e4\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1406567\n\nChange-Id: I68a86876061db11b485cf69e0ada5615f57bb40f\n" }, { "commit": "26537884e4fe97e053c3b14ad8da5b2dad4dc057", "tree": "663fe6ebb0370ca4c8dc6b54802ba5ebe2090ad7", "parents": [ "512ee5976e47fb65d1409970f8b35ecc9d1b931d", "4a4deb6c1ce580324ff285430f27c3f02a01c22d" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Tue Aug 25 08:59:14 2020 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Tue Aug 25 08:59:14 2020 +0000" }, "message": "Merge \"Initialize an uninitialized enum.\"" }, { "commit": "a6d107c011ede2daacca0a5170a14958a9376d2d", "tree": "44df71154e1cc782e5248babc4ac113861337b4f", "parents": [ "8e578c48c4725e337c773330993bf6185c3e5e27", "512ee5976e47fb65d1409970f8b35ecc9d1b931d" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Tue Aug 25 05:57:10 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Aug 25 05:57:10 2020 +0000" }, "message": "[automerger skipped] Merge \"Merge stage branch to development trunk.\" am: 512ee5976e -s ours\n\nam skip reason: Change-Id I2e897306b4c010377222b413f22357b8d3e9765f with SHA-1 877cc2b717 is in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1409196\n\nChange-Id: I7ad0f1594a56181e584a01ca1c27223e55d326b3\n" }, { "commit": "512ee5976e47fb65d1409970f8b35ecc9d1b931d", "tree": "f1228374065e224fefa684e90632e2c3106f31ee", "parents": [ "2b25d86af5c4243796e6c562b8beb51d73aa2263", "beeee2585120d05a21494d78560cdeb7e45aeb73" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Tue Aug 25 04:44:46 2020 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Tue Aug 25 04:44:46 2020 +0000" }, "message": "Merge \"Merge stage branch to development trunk.\"" } ], "next": "beeee2585120d05a21494d78560cdeb7e45aeb73" }