)]}' { "log": [ { "commit": "1481e802c3efeeac9747feab30fbea3a52a27326", "tree": "876284d6db3e9a8845c01249b6b8d5efdd9ed2c6", "parents": [ "9f701294cf47ee7fab1efb5d21d9ac85c89b6867" ], "author": { "name": "Oscar Azucena", "email": "oscarazu@google.com", "time": "Wed Mar 12 10:16:03 2025 -0700" }, "committer": { "name": "Android Build Cherrypicker Worker", "email": "android-build-cherrypicker-worker@google.com", "time": "Wed Mar 12 10:16:03 2025 -0700" }, "message": "Fix trout audio failures\n\nChanges in CF audio broke trout since trout has direct dependency in\ncuttlefish.\n\nBug: 402266715\nFlag: EXEMPT bug fix\nTest: lunch trout_arm64-trunk_staging-userdebug, m -j\nTest: lunch trout_x86_64-trunk_staging-userdebug, m -j\n(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:3561607fca8e2c6d027fda2a063ee05d4f1e804a)\nMerged-In: I89e5f1c8c1f46e7b10b25d20722a86196cc800db\nChange-Id: I89e5f1c8c1f46e7b10b25d20722a86196cc800db\n" }, { "commit": "9f701294cf47ee7fab1efb5d21d9ac85c89b6867", "tree": "a386343b8073d2189fb128d76e095b829a2baca1", "parents": [ "3ab7d8c762a05e96f22bca6954752421bf53b6a8", "b60da05cb76e93f07aaa5ee5011bf64a7df00fd5" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Sat Mar 08 16:09:39 2025 -0800" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Sat Mar 08 16:09:39 2025 -0800" }, "message": "Merge 25Q1 (ab/BP1A.250305.020) to AOSP main\n\nBug: 385190204\nMerged-In: Ia30884e4c9cfca15e42f90c7925b439921df62bf\nChange-Id: I8740e1c02928fba0e224b556007c14eb9cbb631a\n" }, { "commit": "b60da05cb76e93f07aaa5ee5011bf64a7df00fd5", "tree": "a386343b8073d2189fb128d76e095b829a2baca1", "parents": [ "f75b0a36a75ff111a2d1ae6dd5916f19926b4a7a", "3ab7d8c762a05e96f22bca6954752421bf53b6a8" ], "author": { "name": "Herbert Xue", "email": "herbertxue@google.com", "time": "Thu Mar 06 19:03:48 2025 -0800" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Mar 06 19:03:48 2025 -0800" }, "message": "Remove symbolic link for soong build am: 3ab7d8c762\n\nOriginal change: https://android-review.googlesource.com/c/device/google/trout/+/3522779\n\nChange-Id: Ic4378dfcd00ed8bad3374488b9731cd82634c407\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "3ab7d8c762a05e96f22bca6954752421bf53b6a8", "tree": "1673a0239e078ff6d3033a9d7e3af23a6c6304f4", "parents": [ "86d33c60b8fca47e0464ab6a4240ca1414a2e290" ], "author": { "name": "Herbert Xue", "email": "herbertxue@google.com", "time": "Tue Mar 04 18:28:57 2025 +0800" }, "committer": { "name": "Herbert Xue", "email": "herbertxue@google.com", "time": "Tue Mar 04 18:28:57 2025 +0800" }, "message": "Remove symbolic link for soong build\n\nThe symbolic link would cause filegroup search error.\n\nBug: 395988167\nTest: presubmit\nChange-Id: I3f3d84063a93c2a3ca54b9c71f4882b018479dab\n" }, { "commit": "f75b0a36a75ff111a2d1ae6dd5916f19926b4a7a", "tree": "4ab70baa572fcac7af4a4ae00d83d140b93be96f", "parents": [ "30cf28d56ab3519bf54402e1e68e969435555698", "45db0fe73fe12717506a359aee4d0dfe544bb26d" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Mon Feb 10 14:08:04 2025 -0800" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Mon Feb 10 14:08:04 2025 -0800" }, "message": "Merge 25Q1 (ab/12770256) to aosp-main-future\n\nBug: 385190204\nMerged-In: I99060e703b0196ca3dbdc958534a96e4c94e34db\nChange-Id: I7bb015073171cd1aae98652ed5f01d5b64bc8775\n" }, { "commit": "30cf28d56ab3519bf54402e1e68e969435555698", "tree": "726efcb06e0438385a1e9a726de52eba0fcfac44", "parents": [ "f1996004aa0bbbbe2a2880f49a2deba4e15b9751", "86d33c60b8fca47e0464ab6a4240ca1414a2e290" ], "author": { "name": "Steven Moreland", "email": "smoreland@google.com", "time": "Thu Jan 16 10:41:06 2025 -0800" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Jan 16 10:41:06 2025 -0800" }, "message": "Note unconstrained_vsock_violators. am: 86d33c60b8\n\nOriginal change: https://android-review.googlesource.com/c/device/google/trout/+/3453487\n\nChange-Id: Ibab93e3560eb725143e022b4f7f24b5f97f8e3ce\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "86d33c60b8fca47e0464ab6a4240ca1414a2e290", "tree": "726efcb06e0438385a1e9a726de52eba0fcfac44", "parents": [ "f1996004aa0bbbbe2a2880f49a2deba4e15b9751" ], "author": { "name": "Steven Moreland", "email": "smoreland@google.com", "time": "Thu Jan 16 00:32:07 2025 +0000" }, "committer": { "name": "Steven Moreland", "email": "smoreland@google.com", "time": "Thu Jan 16 00:32:12 2025 +0000" }, "message": "Note unconstrained_vsock_violators.\n\nWe may need other solutions in order to constrain how\nvsock connections can be opened up. However, right now\nwhat connections can be made to is unrestricted, which\nprevents us from strengthening security around these\nsettings. Mark current users of vsock as violators,\nin order to raise awareness and track issues.\n\nFor VM users - generic Android APIs for connected to VMs, either\nthose already in AVF or others should be used.\n\nFor other verticals - we may leave these open indefinitely or talk\nelsewhere.\n\nFor virtual devices and VMs, we may need a new way to get host\nconnections or modify the sepolicy around this case.\n\nBug: 347661724\nTest: build\nChange-Id: Ic25ba5077aa3f56be06e873615c07209f40ee8d3\n" }, { "commit": "45db0fe73fe12717506a359aee4d0dfe544bb26d", "tree": "fee6fafa49a2c353c1416a657755ccfcd0fd5a22", "parents": [ "5cd7e2be3e7726d9f1c9ba278297367ac9b726b2", "f1996004aa0bbbbe2a2880f49a2deba4e15b9751" ], "author": { "name": "Marcin Radomski", "email": "dextero@google.com", "time": "Mon Nov 25 08:04:13 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Nov 25 08:04:13 2024 +0000" }, "message": "Reapply \"Remove some ramdisk module definitions handled by Cuttle...\" am: 558cda45a6 am: f1996004aa\n\nOriginal change: https://android-review.googlesource.com/c/device/google/trout/+/3367788\n\nChange-Id: I93ce1d0a3e2efe7ec4d6fcc53914ba25feefcf65\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "f1996004aa0bbbbe2a2880f49a2deba4e15b9751", "tree": "5a7a6f98b5bf07ab97a0424f9bdbbce840d1d1d2", "parents": [ "2af87f94e9b646070f876a0306cc7c4c87d053ee", "558cda45a6682df5ab75035a9bf6964685ecf6f4" ], "author": { "name": "Marcin Radomski", "email": "dextero@google.com", "time": "Mon Nov 25 07:32:41 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Nov 25 07:32:41 2024 +0000" }, "message": "Reapply \"Remove some ramdisk module definitions handled by Cuttle...\" am: 558cda45a6\n\nOriginal change: https://android-review.googlesource.com/c/device/google/trout/+/3367788\n\nChange-Id: I0cc152472732195ce659fe2be710b4943f952ed0\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "5cd7e2be3e7726d9f1c9ba278297367ac9b726b2", "tree": "b736625c0a33d82156644c7fc40abb22cbf97187", "parents": [ "3612016b22e6dfb239f6b221b540d351d9cba866" ], "author": { "name": "Changyeon Jo", "email": "changyeon@google.com", "time": "Fri Nov 22 22:59:22 2024 +0000" }, "committer": { "name": "Changyeon Jo", "email": "changyeon@google.com", "time": "Fri Nov 22 23:05:42 2024 +0000" }, "message": "Update EVS configuration for Trout\n\nRename an emulated camera as /dev/video10.\n\nBug: 380467672\nTest: Manual\nFlag: EXEMPT configuration change only\nChange-Id: I99060e703b0196ca3dbdc958534a96e4c94e34db\n" }, { "commit": "558cda45a6682df5ab75035a9bf6964685ecf6f4", "tree": "5a7a6f98b5bf07ab97a0424f9bdbbce840d1d1d2", "parents": [ "6aa0121ba04f190644c602cd00adfbbc4fd47fc7" ], "author": { "name": "Marcin Radomski", "email": "dextero@google.com", "time": "Fri Nov 22 11:38:06 2024 +0100" }, "committer": { "name": "Marcin Radomski", "email": "dextero@google.com", "time": "Fri Nov 22 11:47:53 2024 +0100" }, "message": "Reapply \"Remove some ramdisk module definitions handled by Cuttle...\"\n\nReapplying Cuttlefish/Trout changes only as the changes to goldfish\ncaused some issues and the entire topic was reverted.\n\nThis reverts commit 6aa0121ba04f190644c602cd00adfbbc4fd47fc7.\n\nTest: treehugger\nBug: 376629474\nChange-Id: Ib7f0828f1854d45d39f93ae27d2c46855aed2415\n" }, { "commit": "3612016b22e6dfb239f6b221b540d351d9cba866", "tree": "436bcf631cc137f9b8b71b63ae4acab0b760903e", "parents": [ "b3230174b338b0f95851fefd40afff02b36cc152", "2af87f94e9b646070f876a0306cc7c4c87d053ee" ], "author": { "name": "Liana Kazanova", "email": "lkazanova@google.com", "time": "Thu Nov 21 23:40:10 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Nov 21 23:40:10 2024 +0000" }, "message": "Revert \"Remove some ramdisk module definitions handled by Cuttle...\" am: 6aa0121ba0 am: 2af87f94e9\n\nOriginal change: https://android-review.googlesource.com/c/device/google/trout/+/3368850\n\nChange-Id: I0ceb25ae2c7beee9e82637a0c962db44a47e4514\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "2af87f94e9b646070f876a0306cc7c4c87d053ee", "tree": "100c73197620ad4f3cc030c0409c590f35f1cd1f", "parents": [ "cb1e3a4efceed57980e842943710e82839830b3a", "6aa0121ba04f190644c602cd00adfbbc4fd47fc7" ], "author": { "name": "Liana Kazanova", "email": "lkazanova@google.com", "time": "Thu Nov 21 23:17:15 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Nov 21 23:17:15 2024 +0000" }, "message": "Revert \"Remove some ramdisk module definitions handled by Cuttle...\" am: 6aa0121ba0\n\nOriginal change: https://android-review.googlesource.com/c/device/google/trout/+/3368850\n\nChange-Id: Ibaa1a8c90a36e5e3f22be48edc6caf5b65986a51\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "6aa0121ba04f190644c602cd00adfbbc4fd47fc7", "tree": "100c73197620ad4f3cc030c0409c590f35f1cd1f", "parents": [ "bd4c54da6d5f3fdf48528563f25115d0cd3b208f" ], "author": { "name": "Liana Kazanova", "email": "lkazanova@google.com", "time": "Thu Nov 21 22:48:46 2024 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Thu Nov 21 22:48:50 2024 +0000" }, "message": "Revert \"Remove some ramdisk module definitions handled by Cuttle...\"\n\nRevert submission 3367721-prebuilts-path-fix-20241120\n\nReason for revert: DroidMonitor: Potential culprit for http://b/380323620 - verifying through ABTD before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted.\n\nReverted changes: /q/submissionid:3367721-prebuilts-path-fix-20241120\n\nChange-Id: I4bed0ecc9cc515e5265732d7b837b07156077a61\n" }, { "commit": "b3230174b338b0f95851fefd40afff02b36cc152", "tree": "d849acb7ae4723ba521e9301c69b45c804f2ea86", "parents": [ "0fbba6de306c555ef4c11dd23a57e3e5a8df6a4f", "cb1e3a4efceed57980e842943710e82839830b3a" ], "author": { "name": "Marcin Radomski", "email": "dextero@google.com", "time": "Thu Nov 21 22:20:04 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Nov 21 22:20:04 2024 +0000" }, "message": "Remove some ramdisk module definitions handled by Cuttlefish makefile am: bd4c54da6d am: cb1e3a4efc\n\nOriginal change: https://android-review.googlesource.com/c/device/google/trout/+/3367721\n\nChange-Id: Ibf12b7ae0827b3683eb5dad5c914916434e8e7ac\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "cb1e3a4efceed57980e842943710e82839830b3a", "tree": "5a7a6f98b5bf07ab97a0424f9bdbbce840d1d1d2", "parents": [ "45152d7947019fb0877bf277a075896711a10270", "bd4c54da6d5f3fdf48528563f25115d0cd3b208f" ], "author": { "name": "Marcin Radomski", "email": "dextero@google.com", "time": "Thu Nov 21 21:56:00 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Nov 21 21:56:00 2024 +0000" }, "message": "Remove some ramdisk module definitions handled by Cuttlefish makefile am: bd4c54da6d\n\nOriginal change: https://android-review.googlesource.com/c/device/google/trout/+/3367721\n\nChange-Id: I9141e17f941d03a3f49bd24492691e41bef99473\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "bd4c54da6d5f3fdf48528563f25115d0cd3b208f", "tree": "5a7a6f98b5bf07ab97a0424f9bdbbce840d1d1d2", "parents": [ "c9eb977c50902b2111d09784c7f3c83125335524" ], "author": { "name": "Marcin Radomski", "email": "dextero@google.com", "time": "Wed Nov 20 19:08:51 2024 +0000" }, "committer": { "name": "Marcin Radomski", "email": "dextero@google.com", "time": "Wed Nov 20 20:44:46 2024 +0100" }, "message": "Remove some ramdisk module definitions handled by Cuttlefish makefile\n\nTo prevent breaking when the module path changes with a new prebuilt\ndrop.\n\nBug: 376629474\nTest: presubmit, abtd (see CL comments)\nChange-Id: Ib5c738b0d833571f6cd8bf76990c5ecb2b50606c\n" }, { "commit": "0fbba6de306c555ef4c11dd23a57e3e5a8df6a4f", "tree": "436bcf631cc137f9b8b71b63ae4acab0b760903e", "parents": [ "c8f99ef8eb0ebd2df0db555557ef51b184686bd9" ], "author": { "name": "Dipen Pradhan", "email": "dipenp@google.com", "time": "Mon Oct 28 20:35:50 2024 -0700" }, "committer": { "name": "Dipen Pradhan", "email": "dipenp@google.com", "time": "Sat Nov 09 00:28:51 2024 +0000" }, "message": "Use .mk to add DriverUI and related RROs, configs\n\nBug: 377800165\nTest: lunch trout_arm64_ds-trunk_staging-userdebug \\\n \u0026\u0026 m\n Verify DriverUI: aae device screen --display\u003d2\nFlag: EXEMPT - refactor, moved packages into common makefile\nChange-Id: Iee0fda8bd4a10525e8053be9ac09e4c49d668fb9\n" }, { "commit": "c8f99ef8eb0ebd2df0db555557ef51b184686bd9", "tree": "4e9b2f5f3e3a3e6ed82b7bc3cc8ca9c4a5f4fb65", "parents": [ "6d2aa94dee7fb7675351b73848f8b24ac8643b3f" ], "author": { "name": "Dipen Pradhan", "email": "dipenp@google.com", "time": "Wed Oct 09 16:40:53 2024 -0700" }, "committer": { "name": "Dipen Pradhan", "email": "dipenp@google.com", "time": "Wed Oct 09 16:55:07 2024 -0700" }, "message": "Fix typo in trout_arm64_ds build target product name\n\nBug: 370044006\nTest: lunch trout_arm64_ds-trunk_staging-userdebug \u0026\u0026 m\nFlag: EXEMPT - only used in build target trout_arm64_ds\nChange-Id: Ida02a8a10e79bd5f9ad45daf47c06f28c919b9f1\n" }, { "commit": "6d2aa94dee7fb7675351b73848f8b24ac8643b3f", "tree": "81dc76bab1e299f45908bb7c01ada204dc61cb56", "parents": [ "45152d7947019fb0877bf277a075896711a10270" ], "author": { "name": "Dipen Pradhan", "email": "dipenp@google.com", "time": "Thu Sep 26 17:31:56 2024 -0700" }, "committer": { "name": "Dipen Pradhan", "email": "dipenp@google.com", "time": "Mon Oct 07 16:52:22 2024 -0700" }, "message": "Add build target trout_arm64_ds and display settings\n\ntrout_arm64_ds extends trout_arm64, adds DriverUICluster2 packages\nand config overlays\nSet density to 160 for cluster (display\u003d1) on trout_arm64_ds\nCreate new directory product_files_ds to store files related to\ntrout_arm64_ds\n\nTest: lunch trout_arm64_ds-next-userdebug \u0026\u0026 m\nTest: adb shell wm density -d 1\nTest: Manual, run DriverUICluster2 and verify UX\n\nFlag: EXEMPT - only used in build target trout_arm64_ds\n\nBug: 370044006\n\nChange-Id: Ib19a462734f3371fa7b3c7d4222460d189518145\n" }, { "commit": "45152d7947019fb0877bf277a075896711a10270", "tree": "100c73197620ad4f3cc030c0409c590f35f1cd1f", "parents": [ "7e369e77f275f549aca56c0852a42c2c1965518b", "4fdfb8a7ed8a110acb7cf9efa6b528919fe37222" ], "author": { "name": "Hao Chen", "email": "chenhaosjtuacm@google.com", "time": "Fri Sep 13 01:21:18 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Sep 13 01:21:18 2024 +0000" }, "message": "Disable Primary Display Mirroring for Cars am: c9eb977c50 am: 4fdfb8a7ed\n\nOriginal change: https://android-review.googlesource.com/c/device/google/trout/+/3266093\n\nChange-Id: I6f8b3516da2db6b20f0274080f5c69137db44729\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "7e369e77f275f549aca56c0852a42c2c1965518b", "tree": "1cb6223fcc3f5c4c27bcd81a85c02a419095bd24", "parents": [ "52c0d955f1fe8f41e95b68bc9451c5682a064c2d", "5e9422c41c63c2cd98a4a4eb5324e88cf86ea419" ], "author": { "name": "Jyoti Bhayana", "email": "jbhayana@google.com", "time": "Fri Sep 13 01:21:12 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Sep 13 01:21:12 2024 +0000" }, "message": "For Trout add the config to disable the support of mobile data am: e0dd27a0a4 am: 5e9422c41c\n\nOriginal change: https://android-review.googlesource.com/c/device/google/trout/+/3266092\n\nChange-Id: Ic9436fd14768599bc031ee2e4b118486304a162d\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "4fdfb8a7ed8a110acb7cf9efa6b528919fe37222", "tree": "100c73197620ad4f3cc030c0409c590f35f1cd1f", "parents": [ "5e9422c41c63c2cd98a4a4eb5324e88cf86ea419", "c9eb977c50902b2111d09784c7f3c83125335524" ], "author": { "name": "Hao Chen", "email": "chenhaosjtuacm@google.com", "time": "Fri Sep 13 00:56:47 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Sep 13 00:56:47 2024 +0000" }, "message": "Disable Primary Display Mirroring for Cars am: c9eb977c50\n\nOriginal change: https://android-review.googlesource.com/c/device/google/trout/+/3266093\n\nChange-Id: Ice1cb87a67da4c82ae4f7dc3c5a1a2be0796e54f\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "5e9422c41c63c2cd98a4a4eb5324e88cf86ea419", "tree": "1cb6223fcc3f5c4c27bcd81a85c02a419095bd24", "parents": [ "52c0d955f1fe8f41e95b68bc9451c5682a064c2d", "e0dd27a0a46ed7eefe6435b4f9cf854457851e61" ], "author": { "name": "Jyoti Bhayana", "email": "jbhayana@google.com", "time": "Fri Sep 13 00:56:43 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Sep 13 00:56:43 2024 +0000" }, "message": "For Trout add the config to disable the support of mobile data am: e0dd27a0a4\n\nOriginal change: https://android-review.googlesource.com/c/device/google/trout/+/3266092\n\nChange-Id: Ib2f44b2936cb16e854d34aa1f5a0a9473c6914b5\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "c9eb977c50902b2111d09784c7f3c83125335524", "tree": "100c73197620ad4f3cc030c0409c590f35f1cd1f", "parents": [ "e0dd27a0a46ed7eefe6435b4f9cf854457851e61" ], "author": { "name": "Hao Chen", "email": "chenhaosjtuacm@google.com", "time": "Wed Sep 21 16:41:57 2022 -0700" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Thu Sep 12 16:05:54 2024 -0700" }, "message": "Disable Primary Display Mirroring for Cars\n\nWithout this setting, the touchscreen event will not be handled\ncorrectly. This setting exists in the non-AOSP lunch target so\nonly AOSP targets are affected.\n\nTest: Flash and touchscreen works correctly.\n\nBug: 244748339\nChange-Id: Ie1f8e0bc511c10feb13b8dddb1476e211b9764cb\n" }, { "commit": "e0dd27a0a46ed7eefe6435b4f9cf854457851e61", "tree": "1cb6223fcc3f5c4c27bcd81a85c02a419095bd24", "parents": [ "52c0d955f1fe8f41e95b68bc9451c5682a064c2d" ], "author": { "name": "Jyoti Bhayana", "email": "jbhayana@google.com", "time": "Wed Apr 27 13:35:09 2022 -0700" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Thu Sep 12 16:05:45 2024 -0700" }, "message": "For Trout add the config to disable the support of mobile data\n\nBug:230647567\nTest: Run the test\nandroid.telephony.cts.CarrierConfigManagerTest#testExtraRebroadcastOnUnlock\nin module CtsTelephonyTestCases and make sure it pass\n\nChange-Id: Id5b02065b908d003bfe8e80b4aa66901aea63801\n" }, { "commit": "52c0d955f1fe8f41e95b68bc9451c5682a064c2d", "tree": "3fc6a608339047fe73beba699fb87546d95e29c4", "parents": [ "5dbf04980ae0b339f22f0c6fd3c074921db4c85d", "b4e7f1792147f63baf18121e85fb2e57e22163b1" ], "author": { "name": "Gurchetan Singh", "email": "gurchetansingh@google.com", "time": "Wed Jul 24 21:03:53 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Jul 24 21:03:53 2024 +0000" }, "message": "trout: set HOST_CROSS_OS \u003d linux_musl am: b4e7f17921\n\nOriginal change: https://android-review.googlesource.com/c/device/google/trout/+/3190936\n\nChange-Id: I51b9f1b118ca7bccd888e8ffdd555b694458a56d\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "b4e7f1792147f63baf18121e85fb2e57e22163b1", "tree": "3fc6a608339047fe73beba699fb87546d95e29c4", "parents": [ "dc5e605a4b839deb8f689923282f33bbb72d8de7" ], "author": { "name": "Gurchetan Singh", "email": "gurchetansingh@google.com", "time": "Wed Jul 24 11:09:27 2024 -0700" }, "committer": { "name": "Gurchetan Singh", "email": "gurchetansingh@google.com", "time": "Wed Jul 24 11:13:12 2024 -0700" }, "message": "trout: set HOST_CROSS_OS \u003d linux_musl\n\nCuttlefish uses it.\n\nBUG\u003d355235998\nTEST\u003dbuilders\n\nChange-Id: I14b2cfb229d0fec9567e230b49dfc41cb00aa508\n" }, { "commit": "5dbf04980ae0b339f22f0c6fd3c074921db4c85d", "tree": "1049c61211c0072a4bdb0d5522222ebb35dd017c", "parents": [ "dc5e605a4b839deb8f689923282f33bbb72d8de7", "a8c365b1aff3929865ba8f1baa35bd2390124a47" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Tue Jun 18 11:43:23 2024 -0700" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Tue Jun 18 11:43:23 2024 -0700" }, "message": "Mark ab/11976889 as merged in aosp-main-future\n\nBug: 347831320\nMerged-In: Ia5c1fb6cc584833ff849f3759f68ea8872cb7033\nChange-Id: Id0e642586fbaa40c0d4349943eb8d2929261910c\n" }, { "commit": "a8c365b1aff3929865ba8f1baa35bd2390124a47", "tree": "a67f6b62b0b0b374a63a9d5a35a640a15ed839ed", "parents": [ "82c02b5bbd300cc29b89c1f91f6626ffa354cade", "370da284ad216b014ccdfde09bb831887de44e8b" ], "author": { "name": "Brian Daniels", "email": "briandaniels@google.com", "time": "Thu Jun 13 12:47:24 2024 +0000" }, "committer": { "name": "Android Partner Code Review", "email": "android-gerrit-partner@google.com", "time": "Thu Jun 13 12:47:24 2024 +0000" }, "message": "Merge \"Prerequisite changes to switch to 6.1 kernel\"" }, { "commit": "370da284ad216b014ccdfde09bb831887de44e8b", "tree": "9adcdff19a3688ead7b1f6d63fda4a0b0346051d", "parents": [ "d4e0914ce1dfd82d6b9301a866214d97cca420b0" ], "author": { "name": "Brian Daniels", "email": "briandaniels@google.com", "time": "Thu Apr 04 10:52:23 2024 -0400" }, "committer": { "name": "Cherrypicker Worker QA", "email": "android-build-cherrypicker-worker@system.gserviceaccount.com", "time": "Wed Jun 12 14:17:39 2024 +0000" }, "message": "Prerequisite changes to switch to 6.1 kernel\n\n- Add new partitions \"system_dlkm\" and \"vendor_dlkm\"\n - These are added to the fstab to ensure they\u0027re mounted.\n - These new partitions contain the remainder of the kernel modules\n that are loaded at second stage init. The initial kernel modules\n that are required to boot are contained in the vendor ramdisk.\n- Set mac80211_hwsim.radios\u003d0 kernel module parameter\n - Cuttlefish uses bootconfig to set kernel parameters at\n build time. This requires support in the bootloader, but\n not all hypervisors support bootloaders. In this case we set the kernel\n module\u0027s parameter on the kernel command line.\n\nBug: 315309338\nTest: Build and verify functionality manually on a board\n(cherry picked from https://android-review.googlesource.com/q/commit:e7a13bd030d3db7b326221125bf044c8f302ac87)\nMerged-In: Ia5c1fb6cc584833ff849f3759f68ea8872cb7033\nChange-Id: Ia5c1fb6cc584833ff849f3759f68ea8872cb7033\n" }, { "commit": "82c02b5bbd300cc29b89c1f91f6626ffa354cade", "tree": "01128ca80820c3930c0a559907eb79e26f39783f", "parents": [ "d4e0914ce1dfd82d6b9301a866214d97cca420b0" ], "author": { "name": "Brian Daniels", "email": "briandaniels@google.com", "time": "Mon Jun 10 14:32:17 2024 -0400" }, "committer": { "name": "Cherrypicker Worker QA", "email": "android-build-cherrypicker-worker@system.gserviceaccount.com", "time": "Wed Jun 12 13:52:23 2024 +0000" }, "message": "Use 6.1 Kernel by default.\n\nBug: 315309338\nTest: Build and boot on a board\n(cherry picked from https://android-review.googlesource.com/q/commit:eac70041f2c64e28d463ff5459bde38c15d3fbfe)\nMerged-In: Iddd4371f25e8a414f1cedfcbffc02d225fa22d1c\nChange-Id: Iddd4371f25e8a414f1cedfcbffc02d225fa22d1c\n" }, { "commit": "dc5e605a4b839deb8f689923282f33bbb72d8de7", "tree": "1049c61211c0072a4bdb0d5522222ebb35dd017c", "parents": [ "c054f0a61064c4335934e3c37bfff7b52385ee79", "eac70041f2c64e28d463ff5459bde38c15d3fbfe" ], "author": { "name": "Brian Daniels", "email": "briandaniels@google.com", "time": "Wed Jun 12 13:21:56 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Jun 12 13:21:56 2024 +0000" }, "message": "Use 6.1 Kernel by default. am: eac70041f2\n\nOriginal change: https://android-review.googlesource.com/c/device/google/trout/+/3122977\n\nChange-Id: I31bf142fe8ede944dd20dc03bd392f490ff2abd3\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "eac70041f2c64e28d463ff5459bde38c15d3fbfe", "tree": "1049c61211c0072a4bdb0d5522222ebb35dd017c", "parents": [ "2a9654e6ce57db9065d98b5b4ff1ec613e696c89" ], "author": { "name": "Brian Daniels", "email": "briandaniels@google.com", "time": "Mon Jun 10 14:32:17 2024 -0400" }, "committer": { "name": "Brian Daniels", "email": "briandaniels@google.com", "time": "Mon Jun 10 14:32:17 2024 -0400" }, "message": "Use 6.1 Kernel by default.\n\nBug: 315309338\nTest: Build and boot on a board\nChange-Id: Iddd4371f25e8a414f1cedfcbffc02d225fa22d1c\n" }, { "commit": "d4e0914ce1dfd82d6b9301a866214d97cca420b0", "tree": "fa787c3fbb7465906ea8e67122c89d776de1e25b", "parents": [ "278f786bce45b8fdfc615f23cf33df888701de28" ], "author": { "name": "Brian Daniels", "email": "briandaniels@google.com", "time": "Fri May 31 16:03:11 2024 -0400" }, "committer": { "name": "Cherrypicker Worker QA", "email": "android-build-cherrypicker-worker@system.gserviceaccount.com", "time": "Thu Jun 06 21:13:46 2024 +0000" }, "message": "Fix sepolicy error when running trout_virtwifi_setup.sh\n\nBug: 342251904\nTest: Build and test trout on board\n(cherry picked from https://android-review.googlesource.com/q/commit:0ca3a2548ccb3a40ea243f3982e622069d46ba21)\nMerged-In: Ie44c555e443af34d74187e36487350750d326b1e\nChange-Id: Ie44c555e443af34d74187e36487350750d326b1e\n" }, { "commit": "278f786bce45b8fdfc615f23cf33df888701de28", "tree": "aa14756479d93dcb25cf53965b4c844b15e8cbe5", "parents": [ "7265b9fcf9178514de631b21c50ba36c5f1b6c04" ], "author": { "name": "Elliott Hughes", "email": "enh@google.com", "time": "Tue Jun 04 17:16:30 2024 +0000" }, "committer": { "name": "Cherrypicker Worker QA", "email": "android-build-cherrypicker-worker@system.gserviceaccount.com", "time": "Thu Jun 06 14:53:03 2024 +0000" }, "message": "libc++fs is part of libc++ now.\n(cherry picked from https://android-review.googlesource.com/q/commit:e04dca3503136ed0196cadb2f1925a533026aed3)\nMerged-In: Ib30dc219100e8ac17c4cff26473b133927a4566c\nChange-Id: Ib30dc219100e8ac17c4cff26473b133927a4566c\n" }, { "commit": "c054f0a61064c4335934e3c37bfff7b52385ee79", "tree": "2970275c06228206e315d31cdf90f8f7713715ff", "parents": [ "6891ecbc94137b624081473dbe6d9b9f25a33618", "2a9654e6ce57db9065d98b5b4ff1ec613e696c89" ], "author": { "name": "Brian Daniels", "email": "briandaniels@google.com", "time": "Wed Jun 05 18:46:56 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Jun 05 18:46:56 2024 +0000" }, "message": "Merge \"Update trout OWNERS\" into main am: 2a9654e6ce\n\nOriginal change: https://android-review.googlesource.com/c/device/google/trout/+/3116364\n\nChange-Id: Ic5de3798f485b117abc09e11672839ea8ed545e9\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "7265b9fcf9178514de631b21c50ba36c5f1b6c04", "tree": "d4b3ece6deef838f29a12f08d22c7a85740a0c58", "parents": [ "4d898e01e40d6c8aa70ba4f5580e454c363c707f" ], "author": { "name": "Brian Daniels", "email": "briandaniels@google.com", "time": "Wed Jun 05 14:35:59 2024 -0400" }, "committer": { "name": "Brian Daniels", "email": "briandaniels@google.com", "time": "Wed Jun 05 14:35:59 2024 -0400" }, "message": "Update trout OWNERS to match AOSP\n\nBug: 345171804\nTest: N/A\nChange-Id: If58f35a5914d2fef67d6b1788deb887785923bb4\n" }, { "commit": "2a9654e6ce57db9065d98b5b4ff1ec613e696c89", "tree": "2970275c06228206e315d31cdf90f8f7713715ff", "parents": [ "e04dca3503136ed0196cadb2f1925a533026aed3", "9fe9cf5c6f572024e66e675b5cab54e41df8d5c4" ], "author": { "name": "Brian Daniels", "email": "briandaniels@google.com", "time": "Wed Jun 05 18:31:06 2024 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Wed Jun 05 18:31:06 2024 +0000" }, "message": "Merge \"Update trout OWNERS\" into main" }, { "commit": "9fe9cf5c6f572024e66e675b5cab54e41df8d5c4", "tree": "45429de1dae3074ec114f2e7f4972e34e426b3f4", "parents": [ "2e6fc8985309ad13d10c6522e185b137b096fc74" ], "author": { "name": "Brian Daniels", "email": "briandaniels@google.com", "time": "Wed Jun 05 08:40:16 2024 -0400" }, "committer": { "name": "Sean Keys", "email": "skeys@google.com", "time": "Wed Jun 05 12:51:58 2024 +0000" }, "message": "Update trout OWNERS\n\nBug: 345171804\nTest: N/A\nChange-Id: I979c8412950c3b337b5a66325f395ee250e55cc1\n" }, { "commit": "6891ecbc94137b624081473dbe6d9b9f25a33618", "tree": "1aed20db57fd40addcf0a7e4149e5d69265c3f23", "parents": [ "1ee9aa0b10d5e63fb835ffeabec546aacd6c6aa0", "e04dca3503136ed0196cadb2f1925a533026aed3" ], "author": { "name": "Elliott Hughes", "email": "enh@google.com", "time": "Tue Jun 04 20:13:27 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Jun 04 20:13:27 2024 +0000" }, "message": "libc++fs is part of libc++ now. am: e04dca3503\n\nOriginal change: https://android-review.googlesource.com/c/device/google/trout/+/3113959\n\nChange-Id: I2d2a1c137bfb88efadf824ee369dae9cf097aa24\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "e04dca3503136ed0196cadb2f1925a533026aed3", "tree": "1aed20db57fd40addcf0a7e4149e5d69265c3f23", "parents": [ "0ca3a2548ccb3a40ea243f3982e622069d46ba21" ], "author": { "name": "Elliott Hughes", "email": "enh@google.com", "time": "Tue Jun 04 17:16:30 2024 +0000" }, "committer": { "name": "Elliott Hughes", "email": "enh@google.com", "time": "Tue Jun 04 17:16:30 2024 +0000" }, "message": "libc++fs is part of libc++ now.\n\nChange-Id: Ib30dc219100e8ac17c4cff26473b133927a4566c\n" }, { "commit": "1ee9aa0b10d5e63fb835ffeabec546aacd6c6aa0", "tree": "080ffaaeb6aec2151fbbdbd4a5fb8ff0ebc633de", "parents": [ "e46d2874433797f7d6aca39cdb743b25731a29d0", "0ca3a2548ccb3a40ea243f3982e622069d46ba21" ], "author": { "name": "Brian Daniels", "email": "briandaniels@google.com", "time": "Mon Jun 03 14:46:19 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Jun 03 14:46:19 2024 +0000" }, "message": "Fix sepolicy error when running trout_virtwifi_setup.sh am: 0ca3a2548c\n\nOriginal change: https://android-review.googlesource.com/c/device/google/trout/+/3109641\n\nChange-Id: Ie07a36f2f47d16d57a1caa6fa3b77ffbcdb9659d\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "0ca3a2548ccb3a40ea243f3982e622069d46ba21", "tree": "080ffaaeb6aec2151fbbdbd4a5fb8ff0ebc633de", "parents": [ "2e6fc8985309ad13d10c6522e185b137b096fc74" ], "author": { "name": "Brian Daniels", "email": "briandaniels@google.com", "time": "Fri May 31 16:03:11 2024 -0400" }, "committer": { "name": "Brian Daniels", "email": "briandaniels@google.com", "time": "Fri May 31 16:03:11 2024 -0400" }, "message": "Fix sepolicy error when running trout_virtwifi_setup.sh\n\nBug: 342251904\nTest: Build and test trout on board\nChange-Id: Ie44c555e443af34d74187e36487350750d326b1e\n" }, { "commit": "4d898e01e40d6c8aa70ba4f5580e454c363c707f", "tree": "a9cf39ca3b36bf9275773d96bc2ff4433c6d0228", "parents": [ "79e35537d72e000ef00f4c6cd60dc2a5f5e7e68c" ], "author": { "name": "Yu Shan", "email": "shanyu@google.com", "time": "Tue May 21 13:38:16 2024 -0700" }, "committer": { "name": "Cherrypicker Worker QA", "email": "android-build-cherrypicker-worker@system.gserviceaccount.com", "time": "Wed May 29 02:06:58 2024 +0000" }, "message": "Enable vsockinfo on host.\n\nAllow vsockinfo and its str function to be used on non Android\nenvironment.\n\nTest: Compile on host.\nBug: 328316981\nFlag: EXEMPT hal change\n(cherry picked from https://android-review.googlesource.com/q/commit:2e6fc8985309ad13d10c6522e185b137b096fc74)\nMerged-In: Idda6bb4367c74e3c6c0ea2850688ed463098585b\nChange-Id: Idda6bb4367c74e3c6c0ea2850688ed463098585b\n" }, { "commit": "e46d2874433797f7d6aca39cdb743b25731a29d0", "tree": "d456680095099150c30164d58e7535f0e4e921f1", "parents": [ "011c111985212049cab953e059d393e46b9dd9fe", "2e6fc8985309ad13d10c6522e185b137b096fc74" ], "author": { "name": "Yu Shan", "email": "shanyu@google.com", "time": "Fri May 24 20:08:52 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri May 24 20:08:52 2024 +0000" }, "message": "Enable vsockinfo on host. am: 2e6fc89853\n\nOriginal change: https://android-review.googlesource.com/c/device/google/trout/+/3096429\n\nChange-Id: I057ab49533fd00e64c332e8f944d92ddb2d9794d\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "2e6fc8985309ad13d10c6522e185b137b096fc74", "tree": "d456680095099150c30164d58e7535f0e4e921f1", "parents": [ "933ca70f7b369941a3119efc5028164e954dc667" ], "author": { "name": "Yu Shan", "email": "shanyu@google.com", "time": "Tue May 21 13:38:16 2024 -0700" }, "committer": { "name": "Yu Shan", "email": "shanyu@google.com", "time": "Tue May 21 13:40:15 2024 -0700" }, "message": "Enable vsockinfo on host.\n\nAllow vsockinfo and its str function to be used on non Android\nenvironment.\n\nTest: Compile on host.\nBug: 328316981\nFlag: EXEMPT hal change\n\nChange-Id: Idda6bb4367c74e3c6c0ea2850688ed463098585b\n" }, { "commit": "011c111985212049cab953e059d393e46b9dd9fe", "tree": "bc45dba83fb4694bee42e9fd31f5bea29cbdd5be", "parents": [ "910605cdb734e461ecc8e37ad61706b05380cd4e", "933ca70f7b369941a3119efc5028164e954dc667" ], "author": { "name": "Wei Li", "email": "weiwli@google.com", "time": "Thu May 02 22:45:37 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu May 02 22:45:37 2024 +0000" }, "message": "Move license metadata declarations to meta-lic.mk and remove the Android.mk file. am: 933ca70f7b\n\nOriginal change: https://android-review.googlesource.com/c/device/google/trout/+/3065762\n\nChange-Id: I3177ddc5b9f6acb115c5992badce4a792ab070c0\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "933ca70f7b369941a3119efc5028164e954dc667", "tree": "bc45dba83fb4694bee42e9fd31f5bea29cbdd5be", "parents": [ "f7a6cf718426bf539d50fd959045689051c44bc7" ], "author": { "name": "Wei Li", "email": "weiwli@google.com", "time": "Mon Apr 29 13:09:43 2024 -0700" }, "committer": { "name": "Wei Li", "email": "weiwli@google.com", "time": "Mon Apr 29 13:09:43 2024 -0700" }, "message": "Move license metadata declarations to meta-lic.mk and remove the Android.mk file.\n\nBug: 309903693\nTest: CIs\nChange-Id: I47f5329a9f7756ca29a8e1ae65fb39a58b0814d4\n" }, { "commit": "910605cdb734e461ecc8e37ad61706b05380cd4e", "tree": "a1b1f7a52e16f9d22f08d4e1f7eea0b21b9efacb", "parents": [ "9281288fb7ac98074cecb66144f4fc7580a39456", "79e35537d72e000ef00f4c6cd60dc2a5f5e7e68c" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Mon Apr 29 11:48:29 2024 -0700" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Mon Apr 29 11:48:29 2024 -0700" }, "message": "Empty merge of Android 24Q2 Release (ab/11526283) to aosp-main-future\n\nBug: 337098550\nMerged-In: Ic0bdf3fa9d6d4e63e16d2bcce0378376cf36d0f6\nChange-Id: I87f757f10f48a5cf25e0b732a42b88759f3dce5d\n" }, { "commit": "9281288fb7ac98074cecb66144f4fc7580a39456", "tree": "a1b1f7a52e16f9d22f08d4e1f7eea0b21b9efacb", "parents": [ "b5539018122ac66c1c7f378d8843b39fc9017c87", "f7a6cf718426bf539d50fd959045689051c44bc7" ], "author": { "name": "Owner Cleanup Bot", "email": "swarming-tasks@owners-cleanup-prod.google.com.iam.gserviceaccount.com", "time": "Mon Apr 22 16:47:24 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Apr 22 16:47:24 2024 +0000" }, "message": "Remove chenhaosjtuacm@google.com from rro_overlays/EvsOverlay/OWNERS am: f7a6cf7184\n\nOriginal change: https://android-review.googlesource.com/c/device/google/trout/+/3045052\n\nChange-Id: I02a17fe002cee48b597350494029cbbf238cae46\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "f7a6cf718426bf539d50fd959045689051c44bc7", "tree": "a1b1f7a52e16f9d22f08d4e1f7eea0b21b9efacb", "parents": [ "cafde1bf87bba63e98e56a072460f75fefc43d3e" ], "author": { "name": "Owner Cleanup Bot", "email": "swarming-tasks@owners-cleanup-prod.google.com.iam.gserviceaccount.com", "time": "Tue Apr 16 17:41:13 2024 +0000" }, "committer": { "name": "Owner Cleanup Bot", "email": "swarming-tasks@owners-cleanup-prod.google.com.iam.gserviceaccount.com", "time": "Tue Apr 16 17:41:17 2024 +0000" }, "message": "Remove chenhaosjtuacm@google.com from rro_overlays/EvsOverlay/OWNERS\n\nThis suggested change is automatically generated based on group\nmemberships and affiliations.\nIf this change is unnecessary or in error, vote CR -1 and the bot\nwill abandon it. Vote CR +1/2 to approve this change.\n\nSee the owner\u0027s recent activity for context:\nhttps://android-review.googlesource.com/q/chenhaosjtuacm@google.com\n\nTo report an issue, file a bug in the Infra\u003eCodereview component.\n\nChange-Id: I25bf686a6f5d38bcefb523b20df9eca5f0180255\n" }, { "commit": "b5539018122ac66c1c7f378d8843b39fc9017c87", "tree": "a15108e9e03dd51afc4b415a73c104f0579ad278", "parents": [ "ebbc224b9e9e0877eb842d1d9fceab0ce9848a24", "cafde1bf87bba63e98e56a072460f75fefc43d3e" ], "author": { "name": "Brian Daniels", "email": "briandaniels@google.com", "time": "Mon Apr 15 21:39:51 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Apr 15 21:39:51 2024 +0000" }, "message": "Merge \"Prerequisite changes to switch to 6.1 kernel\" into main am: cafde1bf87\n\nOriginal change: https://android-review.googlesource.com/c/device/google/trout/+/3027528\n\nChange-Id: I8b6bb5e56815c83bf6569d97622dc86eb9c54587\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "cafde1bf87bba63e98e56a072460f75fefc43d3e", "tree": "a15108e9e03dd51afc4b415a73c104f0579ad278", "parents": [ "c0a48ea43922eff7db33654ad1f483c1fd2ca5e7", "e7a13bd030d3db7b326221125bf044c8f302ac87" ], "author": { "name": "Brian Daniels", "email": "briandaniels@google.com", "time": "Mon Apr 15 21:21:40 2024 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Mon Apr 15 21:21:40 2024 +0000" }, "message": "Merge \"Prerequisite changes to switch to 6.1 kernel\" into main" }, { "commit": "ebbc224b9e9e0877eb842d1d9fceab0ce9848a24", "tree": "0e9ff3bc692bc26772cb183f1f0bc2734c66e875", "parents": [ "5dd179864984f299e8276078c10be163a9d042d2", "c0a48ea43922eff7db33654ad1f483c1fd2ca5e7" ], "author": { "name": "Enrico Granata", "email": "egranata@google.com", "time": "Mon Apr 15 17:00:16 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Apr 15 17:00:16 2024 +0000" }, "message": "Update OWNERS file for trout am: c0a48ea439\n\nOriginal change: https://android-review.googlesource.com/c/device/google/trout/+/3042532\n\nChange-Id: I7961c0770f8e3b52fa78fddded4dd2dbb148a9d7\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "c0a48ea43922eff7db33654ad1f483c1fd2ca5e7", "tree": "0e9ff3bc692bc26772cb183f1f0bc2734c66e875", "parents": [ "28d1218b7980a8284a8db79a6e845fc22fba7da5" ], "author": { "name": "Enrico Granata", "email": "egranata@google.com", "time": "Mon Apr 15 16:16:45 2024 +0000" }, "committer": { "name": "Enrico Granata", "email": "egranata@google.com", "time": "Mon Apr 15 16:19:11 2024 +0000" }, "message": "Update OWNERS file for trout\n\nChange-Id: I4b2e95f254c9ce69fed216d9c9938d745bd7f6c0\n" }, { "commit": "e7a13bd030d3db7b326221125bf044c8f302ac87", "tree": "d76c58bbd5e285a9ac289c67784bf432d59fc85c", "parents": [ "28d1218b7980a8284a8db79a6e845fc22fba7da5" ], "author": { "name": "Brian Daniels", "email": "briandaniels@google.com", "time": "Thu Apr 04 10:52:23 2024 -0400" }, "committer": { "name": "Brian Daniels", "email": "briandaniels@google.com", "time": "Thu Apr 04 16:37:32 2024 -0400" }, "message": "Prerequisite changes to switch to 6.1 kernel\n\n- Add new partitions \"system_dlkm\" and \"vendor_dlkm\"\n - These are added to the fstab to ensure they\u0027re mounted.\n - These new partitions contain the remainder of the kernel modules\n that are loaded at second stage init. The initial kernel modules\n that are required to boot are contained in the vendor ramdisk.\n- Set mac80211_hwsim.radios\u003d0 kernel module parameter\n - Cuttlefish uses bootconfig to set kernel parameters at\n build time. This requires support in the bootloader, but\n not all hypervisors support bootloaders. In this case we set the kernel\n module\u0027s parameter on the kernel command line.\n\nBug: 315309338\nTest: Build and verify functionality manually on a board\nChange-Id: Ia5c1fb6cc584833ff849f3759f68ea8872cb7033\n" }, { "commit": "5dd179864984f299e8276078c10be163a9d042d2", "tree": "e248417e26f0c986501d49896dff74e81e0993f4", "parents": [ "b7547f50e64d712550d91a145c89bc57a6175a74", "28d1218b7980a8284a8db79a6e845fc22fba7da5" ], "author": { "name": "Brian Daniels", "email": "briandaniels@google.com", "time": "Tue Mar 26 17:24:31 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Mar 26 17:24:31 2024 +0000" }, "message": "Disable the light service. am: 28d1218b79\n\nOriginal change: https://android-review.googlesource.com/c/device/google/trout/+/3014493\n\nChange-Id: I40be630fefb981ae39dc64740d14dbfed054ef90\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "28d1218b7980a8284a8db79a6e845fc22fba7da5", "tree": "e248417e26f0c986501d49896dff74e81e0993f4", "parents": [ "cb6e7452abf543a9f163c5e44ce1e5a403d9957a" ], "author": { "name": "Brian Daniels", "email": "briandaniels@google.com", "time": "Tue Mar 26 11:47:16 2024 -0400" }, "committer": { "name": "Brian Daniels", "email": "briandaniels@google.com", "time": "Tue Mar 26 11:48:21 2024 -0400" }, "message": "Disable the light service.\n\nThis was reverted by cb6e7452abf543a9f163c5e44ce1e5a403d9957a,\nso reapplying now.\n\nBug: 331392128\nChange-Id: Id55be81bc1466ed6ceb3ed74ccdc58b76693ac6f\n" }, { "commit": "b7547f50e64d712550d91a145c89bc57a6175a74", "tree": "e895f5566687e4814976802ca327835082ecd2d3", "parents": [ "d80b6850c387e0ce4885c505f72325e00debe1ea", "cb6e7452abf543a9f163c5e44ce1e5a403d9957a" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Thu Mar 07 09:55:20 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Mar 07 09:55:20 2024 +0000" }, "message": "[automerger skipped] Merge Android 14 QPR2 to AOSP main am: cb6e7452ab -s ours\n\nam skip reason: Merged-In Ib3b0158c3e845c40619ffe4473051c4a0ed8aaf8 with SHA-1 d80b6850c3 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/device/google/trout/+/2990819\n\nChange-Id: I6291cd4948df7c79f2beaa34fc1a1f63d100291b\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "cb6e7452abf543a9f163c5e44ce1e5a403d9957a", "tree": "e895f5566687e4814976802ca327835082ecd2d3", "parents": [ "618d4bd06268a651a71d73a09382e8722162aa32", "d80b6850c387e0ce4885c505f72325e00debe1ea" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Wed Mar 06 09:29:51 2024 -0800" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Wed Mar 06 09:29:51 2024 -0800" }, "message": "Merge Android 14 QPR2 to AOSP main\n\nBug: 319669529\nMerged-In: Ib3b0158c3e845c40619ffe4473051c4a0ed8aaf8\nChange-Id: Ib152efce034548e90de1d82180a5d502d95095bf\n" }, { "commit": "79e35537d72e000ef00f4c6cd60dc2a5f5e7e68c", "tree": "b91ff3cecbbe2c637ae47991610e1847efaaf99f", "parents": [ "103aa4f7681aff12894472181bf3e336fba4639d" ], "author": { "name": "Brian Daniels", "email": "briandaniels@google.com", "time": "Mon Nov 06 16:33:14 2023 -0500" }, "committer": { "name": "Enrico Granata", "email": "egranata@google.com", "time": "Thu Feb 22 12:28:48 2024 -0700" }, "message": "Disable light service\n\nBug: 307420170\nBug: 324967409\nTest: build and boot on board\nChange-Id: Ic0bdf3fa9d6d4e63e16d2bcce0378376cf36d0f6\n" }, { "commit": "d80b6850c387e0ce4885c505f72325e00debe1ea", "tree": "e895f5566687e4814976802ca327835082ecd2d3", "parents": [ "759f1639145b0dd8c15d7f3731f409d6f31e4d01", "618d4bd06268a651a71d73a09382e8722162aa32" ], "author": { "name": "Enrico Granata", "email": "egranata@google.com", "time": "Wed Feb 07 01:01:44 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Feb 07 01:01:44 2024 +0000" }, "message": "[automerger skipped] Include cuttlefish bluetooth sepolicy am: 618d4bd062 -s ours\n\nam skip reason: Merged-In Iddf0a3973206a7bc3d9f3088862093de87980e98 with SHA-1 759f163914 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/device/google/trout/+/2952125\n\nChange-Id: Ib3b0158c3e845c40619ffe4473051c4a0ed8aaf8\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "618d4bd06268a651a71d73a09382e8722162aa32", "tree": "3190eb3c76cdd32d5766190127ba7a73295a82b1", "parents": [ "02137d74ad1d7d9a0885cd97e0f9af09c2b9139e" ], "author": { "name": "Enrico Granata", "email": "egranata@google.com", "time": "Tue Feb 06 00:08:54 2024 +0000" }, "committer": { "name": "Enrico Granata", "email": "egranata@google.com", "time": "Tue Feb 06 21:24:38 2024 +0000" }, "message": "Include cuttlefish bluetooth sepolicy\n\nChange-Id I04c339155d4b61a595083d3714476507cd60f27f broke trout builds.\nDue to how we include bluetooth into our project, this sepolicy was no\nlonger getting included in our build. Adding it back fixes a build\nerror.\n\nBug: 316341137\nTest: build\nChange-Id: Iddf0a3973206a7bc3d9f3088862093de87980e98\nMerged-In: Iddf0a3973206a7bc3d9f3088862093de87980e98\n" }, { "commit": "759f1639145b0dd8c15d7f3731f409d6f31e4d01", "tree": "e895f5566687e4814976802ca327835082ecd2d3", "parents": [ "15d76dd0997e1b30fde2fd02038e6e7388ce4a67" ], "author": { "name": "Enrico Granata", "email": "egranata@google.com", "time": "Tue Feb 06 21:21:41 2024 +0000" }, "committer": { "name": "Cherrypicker Worker", "email": "android-build-cherrypicker-worker@google.com", "time": "Tue Feb 06 21:21:41 2024 +0000" }, "message": "Include cuttlefish bluetooth sepolicy\n\nChange-Id I04c339155d4b61a595083d3714476507cd60f27f broke trout builds.\nDue to how we include bluetooth into our project, this sepolicy was no\nlonger getting included in our build. Adding it back fixes a build\nerror.\n\nBug: 316341137\nTest: build\n(cherry picked from https://android-review.googlesource.com/q/commit:3065357751d84deba957ee1d897154b8f5c1ec6f)\nMerged-In: Iddf0a3973206a7bc3d9f3088862093de87980e98\nChange-Id: Iddf0a3973206a7bc3d9f3088862093de87980e98\n" }, { "commit": "15d76dd0997e1b30fde2fd02038e6e7388ce4a67", "tree": "f95531e7299d6b1dcc0ad5681ee18afa02b5260e", "parents": [ "7d07bd604977c7f73d9b27208cf65544de656683", "02137d74ad1d7d9a0885cd97e0f9af09c2b9139e" ], "author": { "name": "Jason Macnak", "email": "natsu@google.com", "time": "Mon Feb 05 18:59:40 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Feb 05 18:59:40 2024 +0000" }, "message": "Merge \"Remove left over ANGLE sepolicy\" into main am: 02137d74ad\n\nOriginal change: https://android-review.googlesource.com/c/device/google/trout/+/2940666\n\nChange-Id: Ia66a477d0aba21c4794e28e353404b3026fe71e8\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "02137d74ad1d7d9a0885cd97e0f9af09c2b9139e", "tree": "d8a217921e4f05dfafa1890e80442c08d2a51d09", "parents": [ "f605cac642b5a64597b5289882f7a6c361763924", "eaaa9448fd125af73467e94f8477801785cfdf03" ], "author": { "name": "Jason Macnak", "email": "natsu@google.com", "time": "Mon Feb 05 17:47:14 2024 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Mon Feb 05 17:47:14 2024 +0000" }, "message": "Merge \"Remove left over ANGLE sepolicy\" into main" }, { "commit": "eaaa9448fd125af73467e94f8477801785cfdf03", "tree": "35a44c33b557f4a97ddee49807ad1e754f3918a8", "parents": [ "e644505e34ce3dfcf3754fab017f5564afe60abe" ], "author": { "name": "Jason Macnak", "email": "natsu@google.com", "time": "Wed Jan 31 08:28:02 2024 -0800" }, "committer": { "name": "Jason Macnak", "email": "natsu@google.com", "time": "Wed Jan 31 08:28:02 2024 -0800" }, "message": "Remove left over ANGLE sepolicy\n\n... which points to files which don\u0027t exist after ANGLE was\nmoved to /system partition.\n\nBug: b/323177432\nTest: cvd start --gpu_mode\u003dguest_swiftshader\nChange-Id: Ie40448fee3bdfc449fbc9678eb37e42a5c9da90e\n" }, { "commit": "7d07bd604977c7f73d9b27208cf65544de656683", "tree": "fce520e0cb3a951fc4ef914df83438d47335f2b6", "parents": [ "24d0e9692dfc16f2fe9c15577876418bc41ac86c", "2d9f4e0aef48ee7c65a671e799fe34dc22c9b4a0" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Tue Jan 23 20:25:33 2024 -0800" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Tue Jan 23 20:25:33 2024 -0800" }, "message": "Merge Android 24Q1 Release (ab/11220357)\n\nBug: 319669529\nMerged-In: I9dc4b51cb57e5accb3591d1168b43cb756f80f11\nChange-Id: I743e47dc69186facf917c99bf67ff0ac10ce8b5e\n" }, { "commit": "24d0e9692dfc16f2fe9c15577876418bc41ac86c", "tree": "0e57b0144cc7224af1c6e4023729791f007b137e", "parents": [ "f6904eddd1294baf651404ff40b2887ebb66366e", "f605cac642b5a64597b5289882f7a6c361763924" ], "author": { "name": "Devin Moore", "email": "devinmoore@google.com", "time": "Mon Jan 22 19:33:09 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Jan 22 19:33:09 2024 +0000" }, "message": "Remove TARGET_ENABLE_DRMHWCOMPOSER variable am: f605cac642\n\nOriginal change: https://android-review.googlesource.com/c/device/google/trout/+/2918545\n\nChange-Id: If820ed509f8c73877510514c9812c3e16afcef07\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "f605cac642b5a64597b5289882f7a6c361763924", "tree": "0e57b0144cc7224af1c6e4023729791f007b137e", "parents": [ "e644505e34ce3dfcf3754fab017f5564afe60abe" ], "author": { "name": "Devin Moore", "email": "devinmoore@google.com", "time": "Thu Jan 18 21:54:47 2024 +0000" }, "committer": { "name": "Devin Moore", "email": "devinmoore@google.com", "time": "Thu Jan 18 21:54:47 2024 +0000" }, "message": "Remove TARGET_ENABLE_DRMHWCOMPOSER variable\n\nIt\u0027s no longer used and no longer supported.\n\nTest: none\nBug: 218588089\nChange-Id: I84925bc3fc2e2b4f50cf429e187e91dc3fb88f69\n" }, { "commit": "103aa4f7681aff12894472181bf3e336fba4639d", "tree": "7dc3b7d6afc2af5196bc0cfd6e0baf9b684e2972", "parents": [ "2d9f4e0aef48ee7c65a671e799fe34dc22c9b4a0" ], "author": { "name": "Brian Daniels", "email": "briandaniels@google.com", "time": "Thu Dec 14 09:32:48 2023 -0500" }, "committer": { "name": "Brian Daniels", "email": "briandaniels@google.com", "time": "Thu Dec 14 09:32:48 2023 -0500" }, "message": "Include cuttlefish bluetooth sepolicy\n\nChange-Id I04c339155d4b61a595083d3714476507cd60f27f broke trout builds.\nDue to how we include bluetooth into our project, this sepolicy was no\nlonger getting included in our build. Adding it back fixes a build\nerror.\n\nBug: 316341137\nTest: build\nChange-Id: Iddf0a3973206a7bc3d9f3088862093de87980e98\n" }, { "commit": "2d9f4e0aef48ee7c65a671e799fe34dc22c9b4a0", "tree": "ab32f76c927461950bd65da692cfb5b794fe4830", "parents": [ "90883b0cb542ea31d370336f45f300e1577b9ca8", "a18c60fea9b9a12ced26b45957cbff2b4ce7f1c2" ], "author": { "name": "Brian Daniels", "email": "briandaniels@google.com", "time": "Tue Dec 12 19:20:30 2023 +0000" }, "committer": { "name": "Android Partner Code Review", "email": "android-gerrit-partner@google.com", "time": "Tue Dec 12 19:20:30 2023 +0000" }, "message": "Merge \"Sensor HAL 2.1 Migration\"" }, { "commit": "f6904eddd1294baf651404ff40b2887ebb66366e", "tree": "2d1569d9dc7132e687e433408bfe4e5cebc8681f", "parents": [ "2521cf01fb9ef1fc54b287f9872e7ac03e76bb21", "e644505e34ce3dfcf3754fab017f5564afe60abe" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Mon Dec 11 21:16:51 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Dec 11 21:16:51 2023 +0000" }, "message": "[automerger skipped] Merge Android 14 QPR1 am: e644505e34 -s ours\n\nam skip reason: Merged-In Ib251f67a77d66bd076ef00d9aeafb71d42a987ae with SHA-1 2521cf01fb is already in history\n\nOriginal change: https://android-review.googlesource.com/c/device/google/trout/+/2866289\n\nChange-Id: I3d1d848b5720cb05d0ab9d456d57aa6548526318\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "e644505e34ce3dfcf3754fab017f5564afe60abe", "tree": "2d1569d9dc7132e687e433408bfe4e5cebc8681f", "parents": [ "2868fcfab8016a5e54246809c621152bf7409180", "2521cf01fb9ef1fc54b287f9872e7ac03e76bb21" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Dec 08 13:13:56 2023 -0800" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Dec 08 13:13:56 2023 -0800" }, "message": "Merge Android 14 QPR1\n\nMerged-In: Ib251f67a77d66bd076ef00d9aeafb71d42a987ae\nBug: 315507370\nChange-Id: I5817c5fe570958bd70b8b695abe903ecb8059f68\n" }, { "commit": "2521cf01fb9ef1fc54b287f9872e7ac03e76bb21", "tree": "2d1569d9dc7132e687e433408bfe4e5cebc8681f", "parents": [ "23de5cd1d1e96423b07fc163022b28cac54b9577", "2868fcfab8016a5e54246809c621152bf7409180" ], "author": { "name": "Yi Kong", "email": "yikong@google.com", "time": "Wed Dec 06 17:42:27 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Dec 06 17:42:27 2023 +0000" }, "message": "Fix -Wunused-variable compiler warning am: 2868fcfab8\n\nOriginal change: https://android-review.googlesource.com/c/device/google/trout/+/2861965\n\nChange-Id: Ib251f67a77d66bd076ef00d9aeafb71d42a987ae\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "2868fcfab8016a5e54246809c621152bf7409180", "tree": "09ddcf4ed55baf02d5f427edff7cf39c0b220f78", "parents": [ "d597bb264644b8b1270c9c23204de1fea7f41a0a" ], "author": { "name": "Yi Kong", "email": "yikong@google.com", "time": "Wed Dec 06 16:55:53 2023 +0900" }, "committer": { "name": "Yi Kong", "email": "yikong@google.com", "time": "Wed Dec 06 16:55:53 2023 +0900" }, "message": "Fix -Wunused-variable compiler warning\n\nTest: presubmit\nChange-Id: I81e679d3bc1f7b3f9b855baca157d2af5b6ee867\n" }, { "commit": "90883b0cb542ea31d370336f45f300e1577b9ca8", "tree": "685b973ff9625c772b151953bbc88adc0a4e6c4d", "parents": [ "de045ee96e73074759ae7a4dfd46710c2d5698a9", "349f8fc61dfcde3c2955a988cb809e9f8e863cb6" ], "author": { "name": "Cole Faust", "email": "colefaust@google.com", "time": "Mon Dec 04 21:04:54 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Dec 04 21:04:54 2023 +0000" }, "message": "[automerger skipped] Sandbox DumpstateServerProtoStub_cc/h am: 349f8fc61d -s ours\n\nam skip reason: skipped by user colefaust\n\nOriginal change: https://partner-android-review.googlesource.com/c/device/google/trout/+/2677252\n\nChange-Id: Idd0f98941ded252b7f41aba66b97cecfdc0a9717\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "349f8fc61dfcde3c2955a988cb809e9f8e863cb6", "tree": "5e8f7444e931ce45607ecbad3f9ed00e873f2e9f", "parents": [ "ff5424763b408a394fe80d7fb09909e748114d09" ], "author": { "name": "Cole Faust", "email": "colefaust@google.com", "time": "Fri Dec 01 11:40:00 2023 -0800" }, "committer": { "name": "Cole Faust", "email": "colefaust@google.com", "time": "Fri Dec 01 11:40:00 2023 -0800" }, "message": "Sandbox DumpstateServerProtoStub_cc/h\n\ngo/roboleaf-busy-beavers-sandboxing\n\nThis is a cherrypick with modifications of pa/2536556\n\nBug: 307824623\nBug: 289216071\nTest: Presubmits\nChange-Id: I9dc4b51cb57e5accb3591d1168b43cb756f80f11\n" }, { "commit": "de045ee96e73074759ae7a4dfd46710c2d5698a9", "tree": "685b973ff9625c772b151953bbc88adc0a4e6c4d", "parents": [ "dc2728dfe0d8ef44268e6e606999e3f53c95fb13", "ff5424763b408a394fe80d7fb09909e748114d09" ], "author": { "name": "Cole Faust", "email": "colefaust@google.com", "time": "Wed Nov 22 22:51:43 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Nov 22 22:51:43 2023 +0000" }, "message": "Sandbox trout genrules am: ff5424763b\n\nOriginal change: https://partner-android-review.googlesource.com/c/device/google/trout/+/2668054\n\nChange-Id: I5e8cb07d7744eded7abc61827ad3ad3318185975\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "23de5cd1d1e96423b07fc163022b28cac54b9577", "tree": "9a4ca7e8f31e208fdb22dabeea3a764f3f2ff463", "parents": [ "659547845d61aea2a764d1ab407ae9f8dd5a884a", "d597bb264644b8b1270c9c23204de1fea7f41a0a" ], "author": { "name": "Cole Faust", "email": "colefaust@google.com", "time": "Wed Nov 22 20:35:23 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Nov 22 20:35:23 2023 +0000" }, "message": "Sandbox trout genrules am: d597bb2646\n\nOriginal change: https://android-review.googlesource.com/c/device/google/trout/+/2839595\n\nChange-Id: I7d3802b99ccd28dcc5d232a1614960b57ca43e7e\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "dc2728dfe0d8ef44268e6e606999e3f53c95fb13", "tree": "685b973ff9625c772b151953bbc88adc0a4e6c4d", "parents": [ "2ef2bc15f52c923f585711f5b0273c4de978af90" ], "author": { "name": "Cole Faust", "email": "colefaust@google.com", "time": "Mon Nov 20 14:31:42 2023 -0800" }, "committer": { "name": "Cole Faust", "email": "colefaust@google.com", "time": "Mon Nov 20 14:45:44 2023 -0800" }, "message": "Sandbox trout genrules\n\ngo/roboleaf-busy-beavers-sandboxing\n\nBug: 307824623\nTest: ./build/soong/tests/genrule_sandbox_test.py TracingVMProtoStub_cc TracingVMProtoStub_h VehicleServerProtoStub_cc@default-grpc VehicleServerProtoStub_cc@2.0-grpc-trout VehicleServerProtoStub_h@2.0-grpc-trout VehicleServerProtoStub_h@default-grpc\nChange-Id: I4f7b3fde2c97f86ab5b40d555c298969432ac63c\n" }, { "commit": "ff5424763b408a394fe80d7fb09909e748114d09", "tree": "27fc1d7d508fa4a44e093eb15992339cda843d03", "parents": [ "2a768420fc5c9cab6d5bce0b08bfc5a3aa56d345" ], "author": { "name": "Cole Faust", "email": "colefaust@google.com", "time": "Mon Nov 20 14:31:42 2023 -0800" }, "committer": { "name": "Cole Faust", "email": "colefaust@google.com", "time": "Mon Nov 20 14:41:58 2023 -0800" }, "message": "Sandbox trout genrules\n\ngo/roboleaf-busy-beavers-sandboxing\n\nBug: 307824623\nTest: ./build/soong/tests/genrule_sandbox_test.py TracingVMProtoStub_cc TracingVMProtoStub_h VehicleServerProtoStub_cc@default-grpc VehicleServerProtoStub_cc@2.0-grpc-trout VehicleServerProtoStub_h@2.0-grpc-trout VehicleServerProtoStub_h@default-grpc\nChange-Id: I4f7b3fde2c97f86ab5b40d555c298969432ac63c\n" }, { "commit": "d597bb264644b8b1270c9c23204de1fea7f41a0a", "tree": "fb65d322d243daf9249ffcc88bc16c9b0bb098ca", "parents": [ "b1f876424b2f2e97b4096ec34731b3e7f955a6ec" ], "author": { "name": "Cole Faust", "email": "colefaust@google.com", "time": "Mon Nov 20 14:31:42 2023 -0800" }, "committer": { "name": "Cole Faust", "email": "colefaust@google.com", "time": "Mon Nov 20 14:31:42 2023 -0800" }, "message": "Sandbox trout genrules\n\ngo/roboleaf-busy-beavers-sandboxing\n\nBug: 307824623\nTest: ./build/soong/tests/genrule_sandbox_test.py TracingVMProtoStub_cc TracingVMProtoStub_h VehicleServerProtoStub_cc@default-grpc VehicleServerProtoStub_cc@2.0-grpc-trout VehicleServerProtoStub_h@2.0-grpc-trout VehicleServerProtoStub_h@default-grpc\nChange-Id: I4f7b3fde2c97f86ab5b40d555c298969432ac63c\n" }, { "commit": "a18c60fea9b9a12ced26b45957cbff2b4ce7f1c2", "tree": "c54fbb234d3d7e6d899a3fb0d58bf6c116ce2562", "parents": [ "2ef2bc15f52c923f585711f5b0273c4de978af90" ], "author": { "name": "Brian Daniels", "email": "briandaniels@google.com", "time": "Tue Aug 22 22:02:23 2023 +0000" }, "committer": { "name": "Brian Daniels", "email": "briandaniels@google.com", "time": "Thu Nov 16 14:24:19 2023 -0500" }, "message": "Sensor HAL 2.1 Migration\n\nThis migrates the Sensor HAL from version 2.0 to 2.1. This was completed\nby following the migration guide: https://source.android.com/docs/core/interaction/sensors/sensors-multihal#port-multihal21\n\nThis includes but is not limited to:\n- Moved the sensor HAL from ./hal/2.0 to ./hal/2.1\n- Included the 2.1 version of the sensor HAL interface headers and libs\n- Updated the ::android::hardware::sensors::V2_0 namespace to\n ::android::hardware::sensors::V2_1 within the implementation\n- Updated all relevant types to use the 2.1 versions as needed\n- Updated all calls to `postEvents` to use the new interface, including\n a new call to `createScopedWakelock`\n - I used the implementation within the `goldfish` target as an example\n- Renamed both `getSensorsList()` and `injectSensorData()` to\n `getSensorsList_2_1()` and `injectSensorData_2_1()`, as described in\n the migration guide.\n- Updated the host tests to use the new types and ensured they pass\n- Updated the sensor config file to reference the new 2.1 sensor types\n- Swap the HIDL-based `android.hardware.sensors@2.0-service.multihal` for\n the AIDL-based `android.hardware.sensors-service.multihal`\n\nBug: 266001101\nTest: atest, build trout_arm64, KitchenSink app on Osprey board, no CTS\nregressions\n\nChange-Id: I3bf80381dca81cc9d25a65ee9737adae9db9b058\n" }, { "commit": "659547845d61aea2a764d1ab407ae9f8dd5a884a", "tree": "7d977b61984ab88d59f540f9407e8a0da353b0d3", "parents": [ "6c8ee929edd6fcf62def62f9a4eb3c23333546a7", "b1f876424b2f2e97b4096ec34731b3e7f955a6ec" ], "author": { "name": "Brian Daniels", "email": "briandaniels@google.com", "time": "Tue Nov 07 19:40:26 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Nov 07 19:40:26 2023 +0000" }, "message": "Disable light service am: b1f876424b\n\nOriginal change: https://android-review.googlesource.com/c/device/google/trout/+/2819517\n\nChange-Id: Iff48b85701cd1b6884c4e36ca484bbb9aaaf37f1\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "6c8ee929edd6fcf62def62f9a4eb3c23333546a7", "tree": "6401b4f135c80fb9b98f4ea1997a55b0864f86ea", "parents": [ "987bd05fad5d4e5825569f0f655fa5285fafea23", "c28d8522f75a8cfba588e967ff828ee3b5ef47f5" ], "author": { "name": "Hao Chen", "email": "chenhaosjtuacm@google.com", "time": "Tue Nov 07 15:12:37 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Nov 07 15:12:37 2023 +0000" }, "message": "Disable OEMLock am: c28d8522f7\n\nOriginal change: https://android-review.googlesource.com/c/device/google/trout/+/2818897\n\nChange-Id: I7a59210dfd6b21506628e14219630ff6d0aeb715\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "b1f876424b2f2e97b4096ec34731b3e7f955a6ec", "tree": "9dd0ef165f854d5698a2dc6e93da543658b0df32", "parents": [ "c28d8522f75a8cfba588e967ff828ee3b5ef47f5" ], "author": { "name": "Brian Daniels", "email": "briandaniels@google.com", "time": "Mon Nov 06 16:33:14 2023 -0500" }, "committer": { "name": "Brian Daniels", "email": "briandaniels@google.com", "time": "Tue Nov 07 09:55:20 2023 -0500" }, "message": "Disable light service\n\nBug: 307420170\nTest: build and boot on board\nChange-Id: Ic0bdf3fa9d6d4e63e16d2bcce0378376cf36d0f6\n" }, { "commit": "c28d8522f75a8cfba588e967ff828ee3b5ef47f5", "tree": "7128147616e088d135b6e3e57d965ac2ea029738", "parents": [ "8234eaa53566dad66f745e43222d33621bb75702" ], "author": { "name": "Hao Chen", "email": "chenhaosjtuacm@google.com", "time": "Thu Jun 08 15:20:55 2023 -0700" }, "committer": { "name": "Brian Daniels", "email": "briandaniels@google.com", "time": "Mon Nov 06 14:00:05 2023 -0500" }, "message": "Disable OEMLock\n\nTest: Build and boot with https://android-review.git.corp.google.com/c/device/google/cuttlefish/+/2620460\nBug: 285587449\nChange-Id: I03916cabb75005b5bcc9fa3e9118ba85ca059ae6\n(cherry picked from commit 17cccf26cd11b303113254d2c2c990a55bef7b89)\n" }, { "commit": "987bd05fad5d4e5825569f0f655fa5285fafea23", "tree": "c497105492adc73c6c2873a6dd40acfbe0faffa1", "parents": [ "dd9c1c3b3186542245bf5b53f320b8534ab909b0", "8234eaa53566dad66f745e43222d33621bb75702" ], "author": { "name": "Brian Daniels", "email": "briandaniels@google.com", "time": "Fri Nov 03 14:02:19 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Nov 03 14:02:19 2023 +0000" }, "message": "Remove duplicate includes of cuttlefish build files am: 8234eaa535\n\nOriginal change: https://android-review.googlesource.com/c/device/google/trout/+/2815895\n\nChange-Id: I73e496797e214d06cb202c880930afb207d16de0\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "2ef2bc15f52c923f585711f5b0273c4de978af90", "tree": "d1118620f78869067c871e371f400518a94d2052", "parents": [ "d760e391e66fe6c6284d17f44b445c032b40658e", "e2a95ebc883fd44d9f7090b6d83832c71cd9fd72" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Fri Nov 03 13:30:01 2023 +0000" }, "committer": { "name": "Android Partner Code Review", "email": "android-gerrit-partner@google.com", "time": "Fri Nov 03 13:30:01 2023 +0000" }, "message": "Merge \"Add Hao Chen as OWNER for trout\"" }, { "commit": "e2a95ebc883fd44d9f7090b6d83832c71cd9fd72", "tree": "08443d39080051907f5dc93da6e14ac9928eb22a", "parents": [ "f32ef21232af19d248e42434a291d8d57a872c66" ], "author": { "name": "Enrico Granata", "email": "egranata@google.com", "time": "Thu Nov 02 16:43:40 2023 -0600" }, "committer": { "name": "Enrico Granata", "email": "egranata@google.com", "time": "Thu Nov 02 16:43:40 2023 -0600" }, "message": "Add Hao Chen as OWNER for trout\n\nBug: None\nTest: looked a file\nChange-Id: Ifd85ae5575cef2b62eb654c874027061746791b1\n" }, { "commit": "8234eaa53566dad66f745e43222d33621bb75702", "tree": "d3f5bb3a2133f8bf9e05fdc98fe1f0931e9bc4c3", "parents": [ "821773306dc4967b4da981c6da652f16404fc888" ], "author": { "name": "Brian Daniels", "email": "briandaniels@google.com", "time": "Thu Nov 02 13:08:07 2023 -0400" }, "committer": { "name": "Brian Daniels", "email": "briandaniels@google.com", "time": "Thu Nov 02 16:28:41 2023 -0400" }, "message": "Remove duplicate includes of cuttlefish build files\n\nThe shared/BoardConfig.mk file already includes the two files that were\nincluded by this file. This second include was causing a build error\nregarding duplicate type definition in cuttlefish\u0027s sepolicy.\n\nBug: 307420170\nTest: build\n\nChange-Id: I23298206216d6c2054b75512e112771214dabd69\n" }, { "commit": "d760e391e66fe6c6284d17f44b445c032b40658e", "tree": "1a5358d4c36e89884a776e5ad57cbd8efd5568ec", "parents": [ "11af6acc2c07dcbdf5a8b371cc10665355653d43", "2a768420fc5c9cab6d5bce0b08bfc5a3aa56d345" ], "author": { "name": "Hao Chen", "email": "chenhaosjtuacm@google.com", "time": "Thu Nov 02 17:43:42 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Nov 02 17:43:42 2023 +0000" }, "message": "[automerger skipped] Disable OEMLock am: 2a768420fc -s ours\n\nam skip reason: Merged-In I03916cabb75005b5bcc9fa3e9118ba85ca059ae6 with SHA-1 17cccf26cd is already in history\n\nOriginal change: https://partner-android-review.googlesource.com/c/device/google/trout/+/2653002\n\nChange-Id: I49ba9e1ffda05208148b35bbfb92488f22b4ac3c\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "2a768420fc5c9cab6d5bce0b08bfc5a3aa56d345", "tree": "c34622a433f4817b31e36d282b0c181898deda4e", "parents": [ "ac1312877ad748a89b9b841d43c46338947eee54" ], "author": { "name": "Hao Chen", "email": "chenhaosjtuacm@google.com", "time": "Thu Jun 08 15:20:55 2023 -0700" }, "committer": { "name": "Cherrypicker Worker QA", "email": "android-build-cherrypicker-worker@system.gserviceaccount.com", "time": "Wed Nov 01 20:33:55 2023 +0000" }, "message": "Disable OEMLock\n\nTest: Build and boot with https://android-review.git.corp.google.com/c/device/google/cuttlefish/+/2620460\nBug: 285587449\n(cherry picked from https://partner-android-review.googlesource.com/q/commit:17cccf26cd11b303113254d2c2c990a55bef7b89)\nMerged-In: I03916cabb75005b5bcc9fa3e9118ba85ca059ae6\nChange-Id: I03916cabb75005b5bcc9fa3e9118ba85ca059ae6\n" }, { "commit": "11af6acc2c07dcbdf5a8b371cc10665355653d43", "tree": "1a5358d4c36e89884a776e5ad57cbd8efd5568ec", "parents": [ "e60506538a412e0a84c4346fee4a762ceabd1254", "ac1312877ad748a89b9b841d43c46338947eee54" ], "author": { "name": "Cole Faust", "email": "colefaust@google.com", "time": "Tue Oct 31 21:11:43 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Oct 31 21:11:43 2023 +0000" }, "message": "[automerger skipped] Declare inputs for AudioFocusControlProtoStub_cc/h am: ac1312877a -s ours\n\nam skip reason: Merged-In Id5a6a2f2d51ca8a965e8f638a0c8605b2fcb4249 with SHA-1 e60506538a is already in history\n\nOriginal change: https://partner-android-review.googlesource.com/c/device/google/trout/+/2652672\n\nChange-Id: Idda18b7ae6ff5e6aea6450b549ad856f7590875f\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "ac1312877ad748a89b9b841d43c46338947eee54", "tree": "a1d2a7a55b9cac5371c1f8ffd08e286c1bd5c286", "parents": [ "88d6925f579a8319b3f7ee0f5fb64eb86d2aaa85" ], "author": { "name": "Cole Faust", "email": "colefaust@google.com", "time": "Mon Oct 30 23:16:19 2023 +0000" }, "committer": { "name": "Cole Faust", "email": "colefaust@google.com", "time": "Tue Oct 31 16:29:12 2023 +0000" }, "message": "Declare inputs for AudioFocusControlProtoStub_cc/h\n\nSo that they can be used with sandboxing.\n\nTest: m AudioFocusControlProtoStub_cc AudioFocusControlProtoStub_h\n(cherry picked from https://android-review.googlesource.com/q/commit:5102534d1199a68b2c43273b96acea64d1e140ce)\nMerged-In: Id5a6a2f2d51ca8a965e8f638a0c8605b2fcb4249\nChange-Id: Id5a6a2f2d51ca8a965e8f638a0c8605b2fcb4249\n(cherry picked from commit e60506538a412e0a84c4346fee4a762ceabd1254)\n" }, { "commit": "dd9c1c3b3186542245bf5b53f320b8534ab909b0", "tree": "55f1646a9c78404cc00e4aebe079463b1538566a", "parents": [ "fd180008e8282c1b8fd91c7374bcb89b2ca889d8", "821773306dc4967b4da981c6da652f16404fc888" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Tue Oct 31 00:42:47 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Oct 31 00:42:47 2023 +0000" }, "message": "Merge \"Declare inputs for AudioFocusControlProtoStub_cc/h\" into main am: 821773306d\n\nOriginal change: https://android-review.googlesource.com/c/device/google/trout/+/2802650\n\nChange-Id: I3380e22c3b870af913a04ea5beb2a5892acf46a4\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "821773306dc4967b4da981c6da652f16404fc888", "tree": "2adb6215ad4fa581c8b36df654f95813a8a407bf", "parents": [ "d892fd31718f0f140839b781da4e09f38de20fc0", "5102534d1199a68b2c43273b96acea64d1e140ce" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Tue Oct 31 00:16:51 2023 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Tue Oct 31 00:16:51 2023 +0000" }, "message": "Merge \"Declare inputs for AudioFocusControlProtoStub_cc/h\" into main" }, { "commit": "fd180008e8282c1b8fd91c7374bcb89b2ca889d8", "tree": "0c10989a363ca8c2faf28eb6f45bb20646b8adec", "parents": [ "ced9d0ce4cf79b0f6910b18adb234a7aa3b06eaa", "d892fd31718f0f140839b781da4e09f38de20fc0" ], "author": { "name": "Greg Kaiser", "email": "gkaiser@google.com", "time": "Tue Oct 31 00:11:29 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Oct 31 00:11:29 2023 +0000" }, "message": "Fix lunch choices for git_main am: d892fd3171\n\nOriginal change: https://android-review.googlesource.com/c/device/google/trout/+/2809882\n\nChange-Id: Ib0b9b188ad252738b989af12c7b460a4d5a9b841\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" } ], "next": "e60506538a412e0a84c4346fee4a762ceabd1254" }