)]}' { "log": [ { "commit": "5fb17205d7335fc10f64133e3c40fc17ea27e4c3", "tree": "03eb09ea3dc4f89bba95a544a4a73a51a8226bdf", "parents": [ "8c85638222650d5f53d798f082ebfd777c3f2114" ], "author": { "name": "Ted Bauer", "email": "tedbauer@google.com", "time": "Mon Mar 10 10:47:21 2025 -0700" }, "committer": { "name": "Ted Bauer", "email": "tedbauer@google.com", "time": "Mon Mar 10 10:47:21 2025 -0700" }, "message": "Remove tedbauer from OWNERS đŸ«Ą\n\nTest: m\nBug: 402140448\nChange-Id: Id21e89479020a6c35518a42c6e936e5e7ca8b47f\n" }, { "commit": "8c85638222650d5f53d798f082ebfd777c3f2114", "tree": "bb4fa908e7f5d2435a738c7a9b42e9e8418f7be6", "parents": [ "0b9798e8f4219cb23e74abf03e499812d0053c65", "07266e9c939a666b44571b917e451c8e335ab5db" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Sat Mar 08 16:10:06 2025 -0800" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Sat Mar 08 16:10:06 2025 -0800" }, "message": "Merge 25Q1 (ab/BP1A.250305.020) to AOSP main\n\nBug: 385190204\nMerged-In: I1ed0545c3f20413da504854457b425c86c8d8b4b\nChange-Id: Iae68041aa6a4d9c7e5a96a411e01fe9ba6cbfa46\n" }, { "commit": "07266e9c939a666b44571b917e451c8e335ab5db", "tree": "bb4fa908e7f5d2435a738c7a9b42e9e8418f7be6", "parents": [ "01b8f1daf1e880acf0bb2219456e68b9958f12ba", "0b9798e8f4219cb23e74abf03e499812d0053c65" ], "author": { "name": "Dennis Shen", "email": "dzshen@google.com", "time": "Thu Mar 06 09:26:48 2025 -0800" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Mar 06 09:26:48 2025 -0800" }, "message": "Create a bug fix flag to fix bluetooth flag inconsistency issue am: 0b9798e8f4\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/server_configurable_flags/+/3529174\n\nChange-Id: I38caaa16b9189b6403e1ca04863593ba248292aa\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "0b9798e8f4219cb23e74abf03e499812d0053c65", "tree": "06ebb4263bf5a7128f26c406c5118b22d186edce", "parents": [ "268def7d22f75cc85a652622cf02f0a99a67babd" ], "author": { "name": "Dennis Shen", "email": "dzshen@google.com", "time": "Thu Mar 06 00:27:18 2025 +0000" }, "committer": { "name": "Dennis Shen", "email": "dzshen@google.com", "time": "Thu Mar 06 00:27:18 2025 +0000" }, "message": "Create a bug fix flag to fix bluetooth flag inconsistency issue\n\nBug: 391802823\nTest: m\nChange-Id: I5b4374bfa4868ce72f23da6bd9336adfefce743f\n" }, { "commit": "01b8f1daf1e880acf0bb2219456e68b9958f12ba", "tree": "0ff60a82c6d7a97a4318f647f9e4dcf6ee2378a8", "parents": [ "a3183815122934004ebedc25c76eb0cc7a3e4703", "dbd9855b41f1fb1533cfcca4a1611e73ad11176f" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Mon Feb 10 14:36:05 2025 -0800" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Mon Feb 10 14:36:05 2025 -0800" }, "message": "Merge 25Q1 (ab/12770256) to aosp-main-future\n\nBug: 385190204\nMerged-In: Ia409e25ce4b1e6db7287cd8c62fd00797d056757\nChange-Id: Ibdaf9efd8676c1319a2b889b3c75f6723d42bc8c\n" }, { "commit": "a3183815122934004ebedc25c76eb0cc7a3e4703", "tree": "f21018aed90da4a23c73c26c2f39d2aa02f3bc37", "parents": [ "4bc171b7124b55c8903fefb64e3d1ff6fa384abd", "268def7d22f75cc85a652622cf02f0a99a67babd" ], "author": { "name": "Dennis Shen", "email": "dzshen@google.com", "time": "Wed Jan 22 10:41:49 2025 -0800" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Jan 22 10:41:49 2025 -0800" }, "message": "Revert^2 \"Remove c++ implementation of aconfigd\" am: 268def7d22\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/server_configurable_flags/+/3460423\n\nChange-Id: I94d3bf4642e3bf39b19cfbf7c290f26b0814bf28\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "268def7d22f75cc85a652622cf02f0a99a67babd", "tree": "f21018aed90da4a23c73c26c2f39d2aa02f3bc37", "parents": [ "42c46ee4dde5f0de393cf1c9fc644e594b89c440" ], "author": { "name": "Dennis Shen", "email": "dzshen@google.com", "time": "Wed Jan 22 07:21:43 2025 -0800" }, "committer": { "name": "Dennis Shen", "email": "dzshen@google.com", "time": "Wed Jan 22 07:21:43 2025 -0800" }, "message": "Revert^2 \"Remove c++ implementation of aconfigd\"\n\nThis reverts commit 42c46ee4dde5f0de393cf1c9fc644e594b89c440.\n\nReason for revert: reland the change with the fix\n\nChange-Id: Ia3b4a651d5045cf7dbf929fb2893d2b46f257c81\n" }, { "commit": "4bc171b7124b55c8903fefb64e3d1ff6fa384abd", "tree": "ddf0f9ed1ffcac5908143182f84fc4c3135d9369", "parents": [ "a9c99144dd357001718ca46d6428e7e785cedcbc", "42c46ee4dde5f0de393cf1c9fc644e594b89c440" ], "author": { "name": "Priyanka Advani (xWF)", "email": "padvani@google.com", "time": "Wed Jan 15 11:35:18 2025 -0800" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Jan 15 11:35:18 2025 -0800" }, "message": "Revert \"Remove c++ implementation of aconfigd\" am: 42c46ee4dd\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/server_configurable_flags/+/3454581\n\nChange-Id: Icea2b4f874831af554035b6630a3ea210bebd453\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "42c46ee4dde5f0de393cf1c9fc644e594b89c440", "tree": "ddf0f9ed1ffcac5908143182f84fc4c3135d9369", "parents": [ "7780e0477ec6c053fcbbb4d8afd3a5827fb1f42f" ], "author": { "name": "Priyanka Advani (xWF)", "email": "padvani@google.com", "time": "Wed Jan 15 10:20:30 2025 -0800" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Wed Jan 15 10:20:30 2025 -0800" }, "message": "Revert \"Remove c++ implementation of aconfigd\"\n\nThis reverts commit 7780e0477ec6c053fcbbb4d8afd3a5827fb1f42f.\n\nReason for revert: Droidmonitor created revert due to potential culprit for b/390175799, b/390065295. Will be verifying through ABTD before submission.\n\nChange-Id: I3be2891ff679ee6b33e01655c24486ba1f2f3c70\n" }, { "commit": "a9c99144dd357001718ca46d6428e7e785cedcbc", "tree": "45c6cc32bb7f07183b8777a617234e1e12c77adf", "parents": [ "f20e74ad3e0d9b8664f8c3a1a3df0ee71184fe0e", "7780e0477ec6c053fcbbb4d8afd3a5827fb1f42f" ], "author": { "name": "Dennis Shen", "email": "dzshen@google.com", "time": "Wed Jan 15 07:32:49 2025 -0800" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Jan 15 07:32:49 2025 -0800" }, "message": "Remove c++ implementation of aconfigd am: 7780e0477e\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/server_configurable_flags/+/3451650\n\nChange-Id: I88e131bcc97e43a2977774957a9d46deb6c23654\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "7780e0477ec6c053fcbbb4d8afd3a5827fb1f42f", "tree": "45c6cc32bb7f07183b8777a617234e1e12c77adf", "parents": [ "bb0d19967400efae393768b7f23d783582c5126f" ], "author": { "name": "Dennis Shen", "email": "dzshen@google.com", "time": "Tue Jan 14 18:29:00 2025 +0000" }, "committer": { "name": "Dennis Shen", "email": "dzshen@google.com", "time": "Tue Jan 14 12:20:30 2025 -0800" }, "message": "Remove c++ implementation of aconfigd\n\nThe flag to turn on rust implementation of aconfigd has reached nextfood\nfor about a week. Thus removing now deprecated c++ implementation. This\nwould reduce the process memory size.\n\nTest: m\nChange-Id: Ie06734060f5c2c36c65f89f57a41be86408bad3f\nMerged-In: Ie06734060f5c2c36c65f89f57a41be86408bad3f\n" }, { "commit": "f20e74ad3e0d9b8664f8c3a1a3df0ee71184fe0e", "tree": "ddf0f9ed1ffcac5908143182f84fc4c3135d9369", "parents": [ "00d041917dd697e19b1a68a7b14df0cf143078ab", "bb0d19967400efae393768b7f23d783582c5126f" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Fri Dec 20 14:02:50 2024 -0800" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Dec 20 14:02:50 2024 -0800" }, "message": "Merge \"Add missing headers to aconfigd.cpp.\" into main am: bb0d199674\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/server_configurable_flags/+/3417540\n\nChange-Id: Id182385536503f623c4a8851e0a7867636a49b8c\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "bb0d19967400efae393768b7f23d783582c5126f", "tree": "ddf0f9ed1ffcac5908143182f84fc4c3135d9369", "parents": [ "5f3b9cf1e8ec53b9ae260cbf1d7b35106d8193f7", "9210251f91496e83f8c57c409e2bb99355cba660" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Fri Dec 20 13:41:50 2024 -0800" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Fri Dec 20 13:41:50 2024 -0800" }, "message": "Merge \"Add missing headers to aconfigd.cpp.\" into main" }, { "commit": "00d041917dd697e19b1a68a7b14df0cf143078ab", "tree": "4165164f7b11aa5667795430ece9a942ff672394", "parents": [ "05996ac1470f8664d4fe7ee49dd1642717ea2582", "5f3b9cf1e8ec53b9ae260cbf1d7b35106d8193f7" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Wed Dec 18 13:52:21 2024 -0800" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Dec 18 13:52:21 2024 -0800" }, "message": "Merge \"aconfigd: disable socket if build flag is enabled\" into main am: 5f3b9cf1e8\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/server_configurable_flags/+/3411118\n\nChange-Id: I14d693705dd9e3710b3fab78ef6923dc3943285c\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "5f3b9cf1e8ec53b9ae260cbf1d7b35106d8193f7", "tree": "4165164f7b11aa5667795430ece9a942ff672394", "parents": [ "330dd2227de3414e367b50c0fe96e39f88294e41", "86cee84dc0ce7d63cc8294490e57967917beb66a" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Wed Dec 18 13:25:54 2024 -0800" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Wed Dec 18 13:25:54 2024 -0800" }, "message": "Merge \"aconfigd: disable socket if build flag is enabled\" into main" }, { "commit": "86cee84dc0ce7d63cc8294490e57967917beb66a", "tree": "5c0ef558d3305f459cd381d484f2117d4f801f86", "parents": [ "2d69e921609265ad2c7601e4fdec4bd430901716" ], "author": { "name": "Ted Bauer", "email": "tedbauer@google.com", "time": "Wed Dec 18 11:51:10 2024 -0800" }, "committer": { "name": "Ted Bauer", "email": "tedbauer@google.com", "time": "Wed Dec 18 11:51:10 2024 -0800" }, "message": "aconfigd: disable socket if build flag is enabled\n\nBug: 383363034\nChange-Id: Ia251d72481a06bbda59352af9f2be452fbb4ea18\nTest: test on go/abtd with flag enabled and disabled; adb shell ps -A | grep aconfig\n" }, { "commit": "9210251f91496e83f8c57c409e2bb99355cba660", "tree": "3c88133187009caacf047e1417c5d196c379a456", "parents": [ "2d69e921609265ad2c7601e4fdec4bd430901716" ], "author": { "name": "Krzysztof KosiƄski", "email": "krzysio@google.com", "time": "Mon Dec 16 21:26:38 2024 +0000" }, "committer": { "name": "Krzysztof KosiƄski", "email": "krzysio@google.com", "time": "Mon Dec 16 21:28:23 2024 +0000" }, "message": "Add missing headers to aconfigd.cpp.\n\nThe missing headers are causing a build break after upgrading\nProtobuf to version 22.x, because the set of headers included\nby generated proto files has changed.\n\nBug: 329747255\nTest: presubmit\nChange-Id: I7222b1538dc994ef975d226249eb9866e85babbf\n" }, { "commit": "05996ac1470f8664d4fe7ee49dd1642717ea2582", "tree": "c2ab7e64b8d48337abeb267ec83a4aa9bfa80941", "parents": [ "b8872361aeed044e0d50d3640058c3f73885be14", "330dd2227de3414e367b50c0fe96e39f88294e41" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Dec 13 18:44:13 2024 -0800" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Dec 13 18:44:13 2024 -0800" }, "message": "[automerger skipped] Merge 24Q4 into AOSP main am: 330dd2227d -s ours\n\nam skip reason: Merged-In Icdc3a002fb8692aec06b62b607e738e258eb3298 with SHA-1 faa8c331d6 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/server_configurable_flags/+/3414058\n\nChange-Id: I40f51657a8e15a541195422e6175207aa0de60c2\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "330dd2227de3414e367b50c0fe96e39f88294e41", "tree": "c2ab7e64b8d48337abeb267ec83a4aa9bfa80941", "parents": [ "2d69e921609265ad2c7601e4fdec4bd430901716", "b8872361aeed044e0d50d3640058c3f73885be14" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Dec 13 11:15:29 2024 -0800" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Dec 13 11:15:29 2024 -0800" }, "message": "Merge 24Q4 into AOSP main\n\nBug: 370570306\nMerged-In: Icdc3a002fb8692aec06b62b607e738e258eb3298\nChange-Id: Id6e73d5fdf15b1ec2879179cecacd3570f121a99\n" }, { "commit": "dbd9855b41f1fb1533cfcca4a1611e73ad11176f", "tree": "83d7c56e88e49aeb567927c35667e43b5115eb1f", "parents": [ "1c069d8e5f46205f7a90a51f91050b5936a86619", "b8872361aeed044e0d50d3640058c3f73885be14" ], "author": { "name": "Ted Bauer", "email": "tedbauer@google.com", "time": "Fri Dec 06 20:15:39 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Dec 06 20:15:39 2024 +0000" }, "message": "aconfigd: don\u0027t fail OTA flag apply if one flag fails am: 2d69e92160 am: b8872361ae\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/server_configurable_flags/+/3394808\n\nChange-Id: I5e5aece35679820937b750f38d5881a4c9d591c0\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "b8872361aeed044e0d50d3640058c3f73885be14", "tree": "c2ab7e64b8d48337abeb267ec83a4aa9bfa80941", "parents": [ "518e574f36498fc951ab96b0ca44679aeb8adff0", "2d69e921609265ad2c7601e4fdec4bd430901716" ], "author": { "name": "Ted Bauer", "email": "tedbauer@google.com", "time": "Fri Dec 06 19:39:49 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Dec 06 19:39:49 2024 +0000" }, "message": "aconfigd: don\u0027t fail OTA flag apply if one flag fails am: 2d69e92160\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/server_configurable_flags/+/3394808\n\nChange-Id: I9f1a56099aa9bd288f83c66fca2554a8facd869c\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "2d69e921609265ad2c7601e4fdec4bd430901716", "tree": "6a6c4451d01ca333af94eab53a407ba1399bd23a", "parents": [ "f76d76e70d5eb5c8a475b928bd0fc3378326b45c" ], "author": { "name": "Ted Bauer", "email": "tedbauer@google.com", "time": "Fri Dec 06 17:14:59 2024 +0000" }, "committer": { "name": "Ted Bauer", "email": "tedbauer@google.com", "time": "Fri Dec 06 17:14:59 2024 +0000" }, "message": "aconfigd: don\u0027t fail OTA flag apply if one flag fails\n\nChange-Id: Ibbb0cd7c1848c236c936c34320b2c659c5054f08\nTest: m\nBug: 336778457\n" }, { "commit": "1c069d8e5f46205f7a90a51f91050b5936a86619", "tree": "162f5e0164a5c8b81d0f3469b12487f4a737c102", "parents": [ "4058f606da2952ea7f8c5b25a5c3f149e49fec81", "518e574f36498fc951ab96b0ca44679aeb8adff0" ], "author": { "name": "Dennis Shen", "email": "dzshen@google.com", "time": "Wed Dec 04 16:21:43 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Dec 04 16:21:43 2024 +0000" }, "message": "flag guard transition to use mainline aconfigd am: f76d76e70d am: 518e574f36\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/server_configurable_flags/+/3388573\n\nChange-Id: Ib3aea988612706a08026b8b7296fd9ddb3c19bd2\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "518e574f36498fc951ab96b0ca44679aeb8adff0", "tree": "bff6c2b5efcae5fe84af078a0f5134217a0e50f2", "parents": [ "c9bb79a93a33e1d26e03400799b850f554b8d07e", "f76d76e70d5eb5c8a475b928bd0fc3378326b45c" ], "author": { "name": "Dennis Shen", "email": "dzshen@google.com", "time": "Wed Dec 04 15:57:02 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Dec 04 15:57:02 2024 +0000" }, "message": "flag guard transition to use mainline aconfigd am: f76d76e70d\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/server_configurable_flags/+/3388573\n\nChange-Id: I7835d0260a3a99e284591caea698df2da50644c7\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "f76d76e70d5eb5c8a475b928bd0fc3378326b45c", "tree": "be1a42e20e8a64bf56e79546afc468f694eb1e7e", "parents": [ "69b3d07b3f6df3d0fcfb2bb9d0cac0cdaea383fd" ], "author": { "name": "Dennis Shen", "email": "dzshen@google.com", "time": "Tue Dec 03 19:38:36 2024 +0000" }, "committer": { "name": "Dennis Shen", "email": "dzshen@google.com", "time": "Wed Dec 04 03:32:13 2024 +0000" }, "message": "flag guard transition to use mainline aconfigd\n\nChange-Id: Ia409e25ce4b1e6db7287cd8c62fd00797d056757\n" }, { "commit": "4058f606da2952ea7f8c5b25a5c3f149e49fec81", "tree": "e6e131f72c16924ff3aabdea25b10bfedade17b8", "parents": [ "da05f8c7717751d1dea23a5e53bb935a20293978" ], "author": { "name": "Dennis Shen", "email": "dzshen@google.com", "time": "Tue Dec 03 19:38:36 2024 +0000" }, "committer": { "name": "Dennis Shen", "email": "dzshen@google.com", "time": "Tue Dec 03 21:40:13 2024 +0000" }, "message": "flag guard transition to use mainline aconfigd\n\nChange-Id: Ia409e25ce4b1e6db7287cd8c62fd00797d056757\n" }, { "commit": "da05f8c7717751d1dea23a5e53bb935a20293978", "tree": "e837d0dede29f68b15ff44674b3c4ed5c4709e7f", "parents": [ "273e899b27702e26759715d96f4182cdd7ac6638", "c9bb79a93a33e1d26e03400799b850f554b8d07e" ], "author": { "name": "Dennis Shen", "email": "dzshen@google.com", "time": "Mon Dec 02 15:47:57 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Dec 02 15:47:57 2024 +0000" }, "message": "emove new storage test mission marker file code now that new storage is am: 69b3d07b3f am: c9bb79a93a\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/server_configurable_flags/+/3380904\n\nChange-Id: Iba4eb456c647d6245651cf5c79d69b27a379ac27\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "c9bb79a93a33e1d26e03400799b850f554b8d07e", "tree": "d8a58373b50563c7e314e17c9dde0c0dfad485fc", "parents": [ "9458bab12738eaf6e508cc907234e2e2eea20a0c", "69b3d07b3f6df3d0fcfb2bb9d0cac0cdaea383fd" ], "author": { "name": "Dennis Shen", "email": "dzshen@google.com", "time": "Mon Dec 02 15:35:52 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Dec 02 15:35:52 2024 +0000" }, "message": "emove new storage test mission marker file code now that new storage is am: 69b3d07b3f\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/server_configurable_flags/+/3380904\n\nChange-Id: I5339525e15855a12d8b81fdc10563b07d359fa80\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "273e899b27702e26759715d96f4182cdd7ac6638", "tree": "445aded5f69e2655e4ef02bf597d758b993ac9ff", "parents": [ "e1a65f4e914a8bedd050c6d936563f7b70593444", "9458bab12738eaf6e508cc907234e2e2eea20a0c" ], "author": { "name": "Dennis Shen", "email": "dzshen@google.com", "time": "Wed Nov 27 16:19:00 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Nov 27 16:19:00 2024 +0000" }, "message": "Merge \"Fix error handling in aconfigd-system\" into main am: c520d748f3 am: 9458bab127\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/server_configurable_flags/+/3378361\n\nChange-Id: Ia3b7f92596afed7de82b64a86c9a9e237baacaea\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "e1a65f4e914a8bedd050c6d936563f7b70593444", "tree": "25d854f4012b55f047ab5c1cb2330fbb8e44bb7e", "parents": [ "ff7fc9e5e981d147b51d0dffe952dc8ae8f3fd1c", "6c9b2946263b65b2eee97c03a325f2a5be81867e" ], "author": { "name": "Dennis Shen", "email": "dzshen@google.com", "time": "Wed Nov 27 16:16:44 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Nov 27 16:16:44 2024 +0000" }, "message": "[automerger skipped] Deprecate cc_binary aconfigd and the controlling flag am: d2dd55e537 am: 6c9b294626 -s ours\n\nam skip reason: Merged-In Id47f38f4b17758a2a412c4715e663c23cbcbd08a with SHA-1 ff7fc9e5e9 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/server_configurable_flags/+/3377190\n\nChange-Id: Id41aefb4d37325f08e97cbe206097c8ff08d15af\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "9458bab12738eaf6e508cc907234e2e2eea20a0c", "tree": "dd827d825c3d8779869dcdb70851435d8fa12761", "parents": [ "6c9b2946263b65b2eee97c03a325f2a5be81867e", "c520d748f357c8f30ebfa215ca2e0d76cf8c86ee" ], "author": { "name": "Dennis Shen", "email": "dzshen@google.com", "time": "Wed Nov 27 16:06:29 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Nov 27 16:06:29 2024 +0000" }, "message": "Merge \"Fix error handling in aconfigd-system\" into main am: c520d748f3\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/server_configurable_flags/+/3378361\n\nChange-Id: I240c33ba845bf9f9e9dee5c6aefbf97adecb8257\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "69b3d07b3f6df3d0fcfb2bb9d0cac0cdaea383fd", "tree": "b592f02eebc00c5e6b5df55e79b09d84f6740b8b", "parents": [ "c520d748f357c8f30ebfa215ca2e0d76cf8c86ee" ], "author": { "name": "Dennis Shen", "email": "dzshen@google.com", "time": "Wed Nov 27 15:53:37 2024 +0000" }, "committer": { "name": "Dennis Shen", "email": "dzshen@google.com", "time": "Wed Nov 27 15:54:12 2024 +0000" }, "message": "emove new storage test mission marker file code now that new storage is\nlaunched\n\nTest: m\nChange-Id: I0422cf093902f0f36187e6873d4204337d39427f\n" }, { "commit": "c520d748f357c8f30ebfa215ca2e0d76cf8c86ee", "tree": "b78f991c1b2917ace1fa2f053821fd7ac1697231", "parents": [ "d2dd55e5375fc739f7f9bf3dfbd11bd5a9efa756", "64d15fb12be01a765301bfe80fddc285af1f8b4f" ], "author": { "name": "Dennis Shen", "email": "dzshen@google.com", "time": "Wed Nov 27 15:31:15 2024 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Wed Nov 27 15:31:15 2024 +0000" }, "message": "Merge \"Fix error handling in aconfigd-system\" into main" }, { "commit": "6c9b2946263b65b2eee97c03a325f2a5be81867e", "tree": "9257dca293aba2ac4c2bffe212708bf8d79e362d", "parents": [ "90ef97b67427a562019afb1f8ee9156f746a626d", "d2dd55e5375fc739f7f9bf3dfbd11bd5a9efa756" ], "author": { "name": "Dennis Shen", "email": "dzshen@google.com", "time": "Wed Nov 27 13:48:25 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Nov 27 13:48:25 2024 +0000" }, "message": "Deprecate cc_binary aconfigd and the controlling flag am: d2dd55e537\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/server_configurable_flags/+/3377190\n\nChange-Id: Iacccb969fef58634827e21889fa4e4d9decdf9f8\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "64d15fb12be01a765301bfe80fddc285af1f8b4f", "tree": "4fdf050335a627be1c7b2c3ba2749c306b7a95dc", "parents": [ "910e04d7c02034104ba310cfc0a74c25739ba0d1" ], "author": { "name": "Dennis Shen", "email": "dzshen@google.com", "time": "Wed Nov 27 00:12:16 2024 +0000" }, "committer": { "name": "Dennis Shen", "email": "dzshen@google.com", "time": "Wed Nov 27 00:16:45 2024 +0000" }, "message": "Fix error handling in aconfigd-system\n\nIn the cpp code that handles each individual request, if it is an error,\nit should return an error message pb. Before this change, it would stop\nprocessing the remaining requests if one request failed.\n\nTest: atest -c\nChange-Id: I7c24143aac4998be876eeb9e2b8ccecb0acda589\n" }, { "commit": "d2dd55e5375fc739f7f9bf3dfbd11bd5a9efa756", "tree": "fbdcd95419192db92f3e651fe21d0644d86c2f96", "parents": [ "910e04d7c02034104ba310cfc0a74c25739ba0d1" ], "author": { "name": "Dennis Shen", "email": "dzshen@google.com", "time": "Tue Nov 26 00:43:49 2024 +0000" }, "committer": { "name": "Dennis Shen", "email": "dzshen@google.com", "time": "Wed Nov 27 00:15:57 2024 +0000" }, "message": "Deprecate cc_binary aconfigd and the controlling flag\n\ncc_binary aconfigd is replaced with rust_binary aconfigd-system. The\nreplacement is flag guarded and is already in TF full for more than a\nweek. Thus delete the flag and deprecate old cc_binary aconfigd.\n\nTest: m\nChange-Id: Ic9016268a0d3b1e91c049056858e2f9aa5a82cab\nMerged-In: Id47f38f4b17758a2a412c4715e663c23cbcbd08a\n" }, { "commit": "ff7fc9e5e981d147b51d0dffe952dc8ae8f3fd1c", "tree": "25d854f4012b55f047ab5c1cb2330fbb8e44bb7e", "parents": [ "b972b7afaa8fbb50e5cebcbe132a6b3b53561183" ], "author": { "name": "Dennis Shen", "email": "dzshen@google.com", "time": "Tue Nov 26 15:55:17 2024 +0000" }, "committer": { "name": "Cherrypicker Worker", "email": "android-build-cherrypicker-worker@google.com", "time": "Tue Nov 26 15:55:17 2024 +0000" }, "message": "Deprecate cc_binary aconfigd and the controlling flag\n\ncc_binary aconfigd is replaced with rust_binary aconfigd-system. The\nreplacement is flag guarded and is already in TF full for more than a\nweek. Thus delete the flag and deprecate old cc_binary aconfigd.\n\nTest: m\n(cherry picked from https://android-review.googlesource.com/q/commit:73884d4b0bdafe36604f6b853d5df5a01249283e)\nMerged-In: Ic9016268a0d3b1e91c049056858e2f9aa5a82cab\nChange-Id: Ic9016268a0d3b1e91c049056858e2f9aa5a82cab\n\nNOTE FOR REVIEWERS - original patch and result patch are not identical.\nPLEASE REVIEW CAREFULLY.\nDiffs between the patches:\n DEBUG) \u003c\u003c \"received client requests\";\n\u003e -\n\u003e - auto requests \u003d receiveMessage(client_fd.get());\n\u003e - if (!requests.ok()) {\n\u003e - LOG(ERROR) \u003c\u003c requests.error();\n\u003e - continue;\n\u003e - }\n\u003e -\n\u003e - auto return_messages \u003d StorageReturnMessages();\n\u003e - for (auto\u0026 request : requests-\u003emsgs()) {\n\u003e - auto* return_msg \u003d return_messages.add_msgs();\n\u003e - auto result \u003d aconfigd.HandleSocketRequest(request, *return_msg);\n\u003e - if (!result.ok()) {\n\u003e - auto* errmsg \u003d return_msg-\u003emutable_error_message();\n\u003e - *errmsg \u003d result.error().message();\n\u003e - LOG(ERROR) \u003c\u003c \"Failed to handle socket request: \" \u003c\u003c *errmsg;\n\u003e - } else {\n\u003e - LOG(INFO) \u003c\u003c \"Successfully handled socket request\";\n\u003e - }\n\u003e - }\n\u003e -\n\u003e - auto result \u003d sendMessage(client_fd.get(), return_messages);\n\u003e - if (!result.ok()) {\n\u003e - LOG(ERROR) \u003c\u003c result.error();\n\u003e - }\n\u003e - }\n\u003e -\n\u003e - return 1;\n\u003e -}\n\u003e -\n\u003e -int main(int argc, char** argv) {\n\u003e - if (!com::android::aconfig_new_storage::enable_aconfig_storage_daemon()) {\n\u003e - return 0;\n\u003e - }\n\u003e -\n\u003e - if (com::android::aconfig::flags::enable_system_aconfigd_rust()) {\n\u003e - return 0;\n\u003e - }\n\u003e -\n\u003e - android::base::InitLogging(argv, \u0026android::base::KernelLogger);\n\u003e -\n\u003e - if (argc \u003d\u003d 1) {\n\u003e - return aconfigd_start();\n\u003e - } else if (argc \u003d\u003d 2 \u0026\u0026 strcmp(argv[1], \"--platform_init\") \u003d\u003d 0) {\n\u003e - return aconfigd_platform_init();\n\u003e - } else if (argc \u003d\u003d 2 \u0026\u0026 strcmp(argv[1], \"--mainline_init\") \u003d\u003d 0) {\n\u003e - return aconfigd_mainline_init();\n\u003e - } else {\n\u003e - LOG(ERROR) \u003c\u003c \"invalid aconfigd command\";\n\u003e - return 1;\n\u003e - }\n\u003e -}\n\u003e --- aconfigd/src/main.rs\n\u003e +++ aconfigd/src/main.rs\n\u003e - if !aconfig_flags::auto_generated::enable_system_aconfigd_rust()\n\u003e - || !aconfig_new_storage_flags::enable_aconfig_storage_daemon()\n\u003e - {\n\u003e + if !aconfig_new_storage_flags::enable_aconfig_storage_daemon() {\n\u003e --- aconfigd/srcs/AconfigdClientSocketImpl.java\n\u003e +++ aconfigd/srcs/AconfigdClientSocketImpl.java\n\u003e -import com.android.aconfig.flags.Flags;\n\u003e -\n\u003e - Flags.enableSystemAconfigdRust()\n\u003e - ? \"aconfigd_system\" : \"aconfigd\",\n\u003e + \"aconfigd_system\",\n\nOriginal patch:\n From 73884d4b0bdafe36604f6b853d5df5a01249283e Mon Sep 17 00:00:00 2001\nFrom: Dennis Shen \u003cdzshen@google.com\u003e\nDate: Tue, 26 Nov 2024 00:43:49 +0000\nSubject: [PATCH] Deprecate cc_binary aconfigd and the controlling flag\n\ncc_binary aconfigd is replaced with rust_binary aconfigd-system. The\nreplacement is flag guarded and is already in TF full for more than a\nweek. Thus delete the flag and deprecate old cc_binary aconfigd.\n\nTest: m\nChange-Id: Ic9016268a0d3b1e91c049056858e2f9aa5a82cab\n---\n\nResult patch:\n diff --git a/aconfigd/Android.bp b/aconfigd/Android.bp\nindex 872cf83..0534b37 100644\n--- a/aconfigd/Android.bp\n+++ b/aconfigd/Android.bp\n@@ -1,36 +1,8 @@\n-cc_binary {\n- name: \"aconfigd\",\n- srcs: [\n- \"aconfigd_main.cpp\",\n- ],\n- static_libs: [\n- \"libaconfig_flags_cc\",\n- \"libaconfigd_protos_cc\",\n- \"libaconfig_storage_file_cc\",\n- \"libaconfig_new_storage_flags\",\n- \"libaconfig_storage_read_api_cc\",\n- \"libaconfig_storage_write_api_cc\",\n- \"libaconfigd\",\n- // TODO(370864013): Remove this once the CTS annotation issue is fixed.\n- \"cts_flags_tests_cc\",\n- ],\n- shared_libs: [\n- \"libcutils\",\n- \"libprotobuf-cpp-lite\",\n- \"libbase\",\n- \"liblog\",\n- \"libcrypto\",\n- \"server_configurable_flags\",\n- ],\n- init_rc: [\"aconfigd.rc\"],\n-}\n-\n rust_binary {\n name: \"aconfigd-system\",\n defaults: [\"aconfigd_system.defaults\"],\n srcs: [\"src/main.rs\"],\n rustlibs: [\n- \"libaconfig_flags\",\n \n[[[Result patch trimmed due to size. Decoded string size: 11696. Decoded string SHA1: 3c5755bbd2843f5a810c23a773d004ed2cf01dad.]]]\n\nChange-Id: Id47f38f4b17758a2a412c4715e663c23cbcbd08a\n" }, { "commit": "b972b7afaa8fbb50e5cebcbe132a6b3b53561183", "tree": "4e5fdd5b1d29b281edc204b87753d635c030f5d4", "parents": [ "d7a17cad7414f1843fb3c4cd76841059daf0bcae", "90ef97b67427a562019afb1f8ee9156f746a626d" ], "author": { "name": "Dennis Shen", "email": "dzshen@google.com", "time": "Mon Nov 25 20:05:32 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Nov 25 20:05:32 2024 +0000" }, "message": "[automerger skipped] Merge \"aconfigd: migrate to full rust aconfigd\" into main am: 910e04d7c0 am: 90ef97b674 -s ours\n\nam skip reason: Merged-In I8b91c85b9301f87114ade7ac42d774e01c01b58f with SHA-1 3cc53825e4 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/server_configurable_flags/+/3370012\n\nChange-Id: I11699a4af7ebacb60f1d830036501d0da5fe4a92\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "90ef97b67427a562019afb1f8ee9156f746a626d", "tree": "174abe340f0814be660cb5947798fcbe67a752f6", "parents": [ "f4d64afe5bd3b10bdb63e3eb2acddbd6b0f08b22", "910e04d7c02034104ba310cfc0a74c25739ba0d1" ], "author": { "name": "Dennis Shen", "email": "dzshen@google.com", "time": "Mon Nov 25 19:29:38 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Nov 25 19:29:38 2024 +0000" }, "message": "Merge \"aconfigd: migrate to full rust aconfigd\" into main am: 910e04d7c0\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/server_configurable_flags/+/3370012\n\nChange-Id: I32d8beb9e5f9afa9c96e7f8121afa9091bf18914\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "910e04d7c02034104ba310cfc0a74c25739ba0d1", "tree": "0abbf09bba8492973fc801791a513f25e2e48d50", "parents": [ "04cff1baa3ba538d817dd1bed1a93ae1ed6d6e21", "988d15c3081a519dd25005e80cebcb14236b2ff1" ], "author": { "name": "Dennis Shen", "email": "dzshen@google.com", "time": "Mon Nov 25 19:04:20 2024 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Mon Nov 25 19:04:20 2024 +0000" }, "message": "Merge \"aconfigd: migrate to full rust aconfigd\" into main" }, { "commit": "d7a17cad7414f1843fb3c4cd76841059daf0bcae", "tree": "4e5fdd5b1d29b281edc204b87753d635c030f5d4", "parents": [ "3cc53825e4c360e58d32badab9eaf76d1047d54a", "f4d64afe5bd3b10bdb63e3eb2acddbd6b0f08b22" ], "author": { "name": "Dennis Shen", "email": "dzshen@google.com", "time": "Mon Nov 25 18:33:17 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Nov 25 18:33:17 2024 +0000" }, "message": "Merge \"move aconfigd platform init service into aconfigd.rc\" into main am: 04cff1baa3 am: f4d64afe5b\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/server_configurable_flags/+/3341405\n\nChange-Id: I9603c78f344743e53adfc73d558ad75f10896d06\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "f4d64afe5bd3b10bdb63e3eb2acddbd6b0f08b22", "tree": "400fe3ba537e1d73a06e142f2cb22b9b8c746f7b", "parents": [ "63c8209e9a1c792d115bb74b2df90e072205f34b", "04cff1baa3ba538d817dd1bed1a93ae1ed6d6e21" ], "author": { "name": "Dennis Shen", "email": "dzshen@google.com", "time": "Mon Nov 25 17:45:09 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Nov 25 17:45:09 2024 +0000" }, "message": "Merge \"move aconfigd platform init service into aconfigd.rc\" into main am: 04cff1baa3\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/server_configurable_flags/+/3341405\n\nChange-Id: I8d7ff15a43668f3347eed8746bcc4c19e8de5ad5\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "04cff1baa3ba538d817dd1bed1a93ae1ed6d6e21", "tree": "61222828b773a352df0b4206044acf3023248c8c", "parents": [ "cdf0f5c61ff44ead1f382b6ee852796cd58ace60", "729f2978e54dbdaff1ec0afcfaee94f9fa6be0d3" ], "author": { "name": "Dennis Shen", "email": "dzshen@google.com", "time": "Mon Nov 25 17:27:03 2024 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Mon Nov 25 17:27:03 2024 +0000" }, "message": "Merge \"move aconfigd platform init service into aconfigd.rc\" into main" }, { "commit": "988d15c3081a519dd25005e80cebcb14236b2ff1", "tree": "319535688b24cb53ec811f29918243ad9a08f9cc", "parents": [ "cdf0f5c61ff44ead1f382b6ee852796cd58ace60" ], "author": { "name": "Dennis Shen", "email": "dzshen@google.com", "time": "Fri Nov 22 20:26:42 2024 +0000" }, "committer": { "name": "Dennis Shen", "email": "dzshen@google.com", "time": "Mon Nov 25 14:50:45 2024 +0000" }, "message": "aconfigd: migrate to full rust aconfigd\n\nTest: m\nChange-Id: I8b91c85b9301f87114ade7ac42d774e01c01b58f\nMerged-In: I8b91c85b9301f87114ade7ac42d774e01c01b58f\n" }, { "commit": "3cc53825e4c360e58d32badab9eaf76d1047d54a", "tree": "ba2644aef0e00d0e026805ea24dc795b24cd5990", "parents": [ "c9c25ba5c01513ec043639f77f1da97d855072de" ], "author": { "name": "Dennis Shen", "email": "dzshen@google.com", "time": "Fri Nov 22 20:26:42 2024 +0000" }, "committer": { "name": "Dennis Shen", "email": "dzshen@google.com", "time": "Mon Nov 25 14:34:58 2024 +0000" }, "message": "aconfigd: migrate to full rust aconfigd\n\ncherry pick of aosp/3370012 to avoid merge conflict\n\nTest: m\nChange-Id: I8b91c85b9301f87114ade7ac42d774e01c01b58f\n" }, { "commit": "c9c25ba5c01513ec043639f77f1da97d855072de", "tree": "453803addb32f12fa5fc9a19ddce7fba92044ea6", "parents": [ "3aa487a2165299d3f8d809cce17762012e8d2a62", "fc31980a196c32284c5b54a15d8cabf7b486fc6e" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Fri Nov 22 22:18:25 2024 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Nov 22 22:18:25 2024 +0000" }, "message": "Merge \"Remove marker file creation\" into main" }, { "commit": "3aa487a2165299d3f8d809cce17762012e8d2a62", "tree": "d12945e691c778b6207980a90468d2865b4da372", "parents": [ "5805c92b418ee2bf9fba9e2738d74095b056350f", "63c8209e9a1c792d115bb74b2df90e072205f34b" ], "author": { "name": "Dennis Shen", "email": "dzshen@google.com", "time": "Fri Nov 22 21:07:56 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Nov 22 21:07:56 2024 +0000" }, "message": "Aconfigd: send an error message back thru socket in case of error am: cdf0f5c61f am: 63c8209e9a\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/server_configurable_flags/+/3371875\n\nChange-Id: I177ba7ab4706da61e33f35024efcc4d8c2cac5a0\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "fc31980a196c32284c5b54a15d8cabf7b486fc6e", "tree": "a9e97481fd119780ced2732277bee4405c7d478d", "parents": [ "9661c2da2b31311d789281636045068155845ed5" ], "author": { "name": "Dennis Shen", "email": "dzshen@google.com", "time": "Fri Nov 22 20:50:21 2024 +0000" }, "committer": { "name": "Dennis Shen", "email": "dzshen@google.com", "time": "Fri Nov 22 20:50:21 2024 +0000" }, "message": "Remove marker file creation\n\nTest: m\nChange-Id: I4356addb63d37ec5681b72aa6295e43c07783b05\n" }, { "commit": "63c8209e9a1c792d115bb74b2df90e072205f34b", "tree": "155b589b4703d888e7e775911a9953408546be97", "parents": [ "565be674282e2a2939f115cb7b282ce1e6e602f7", "cdf0f5c61ff44ead1f382b6ee852796cd58ace60" ], "author": { "name": "Dennis Shen", "email": "dzshen@google.com", "time": "Fri Nov 22 20:43:17 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Nov 22 20:43:17 2024 +0000" }, "message": "Aconfigd: send an error message back thru socket in case of error am: cdf0f5c61f\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/server_configurable_flags/+/3371875\n\nChange-Id: I9d2b095681d89d487b2991ed5e5b39cb3f90ef2e\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "cdf0f5c61ff44ead1f382b6ee852796cd58ace60", "tree": "1276d8d55ccac8ace002f1c99f86925adfee94d6", "parents": [ "288c1735afade11df12ef2d2c35f56a00da928b7" ], "author": { "name": "Dennis Shen", "email": "dzshen@google.com", "time": "Fri Nov 22 19:09:39 2024 +0000" }, "committer": { "name": "Dennis Shen", "email": "dzshen@google.com", "time": "Fri Nov 22 19:09:39 2024 +0000" }, "message": "Aconfigd: send an error message back thru socket in case of error\n\nBug: b/373516260\nTest: m and test locally\nChange-Id: I9d8334868d58b77c455605c14d57f92e04e66221\n" }, { "commit": "5805c92b418ee2bf9fba9e2738d74095b056350f", "tree": "78b17990e48c57c7dce5082f8633ff7b44372027", "parents": [ "37bb1c54237613d4ef7061891e5f7bb98ca5032d", "565be674282e2a2939f115cb7b282ce1e6e602f7" ], "author": { "name": "Ted Bauer", "email": "tedbauer@google.com", "time": "Fri Nov 22 01:09:20 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Nov 22 01:09:20 2024 +0000" }, "message": "Merge OTA messages that have the same build ID am: 288c1735af am: 565be67428\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/server_configurable_flags/+/3368400\n\nChange-Id: Ib638378bfc82aa2a35e14ad247697989e1321d1d\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "565be674282e2a2939f115cb7b282ce1e6e602f7", "tree": "09e8e37e6548b9845bd3cabeb3de00d021a941ec", "parents": [ "288a8bb9d8e9f71b10628378bbe3eacf3a586157", "288c1735afade11df12ef2d2c35f56a00da928b7" ], "author": { "name": "Ted Bauer", "email": "tedbauer@google.com", "time": "Fri Nov 22 00:46:59 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Nov 22 00:46:59 2024 +0000" }, "message": "Merge OTA messages that have the same build ID am: 288c1735af\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/server_configurable_flags/+/3368400\n\nChange-Id: Ieebd084d2487f2a039a8288fb9aca530b3344333\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "288c1735afade11df12ef2d2c35f56a00da928b7", "tree": "8600d0e73c98406d25c782e9c20a89864e7974b9", "parents": [ "4b19b9574ca2bc224256d302dd1b23b27564fef9" ], "author": { "name": "Ted Bauer", "email": "tedbauer@google.com", "time": "Thu Nov 21 18:58:02 2024 +0000" }, "committer": { "name": "Ted Bauer", "email": "tedbauer@google.com", "time": "Thu Nov 21 22:51:56 2024 +0000" }, "message": "Merge OTA messages that have the same build ID\n\nWhen sending messages to aconfigd to stage OTA flags, the current\nbehavior overrides the existing mapping each time. Change the behavior\nso that when the message is sent, and the build ID matches the persisted\nbuild ID, we concatenate the new overrides to the existing ones.\n\nBug: 364735706\nTest: manually invoked from DeviceConfigService\nChange-Id: I1476d0ee409ebc08b659885b56ffc3091feaaa87\n" }, { "commit": "37bb1c54237613d4ef7061891e5f7bb98ca5032d", "tree": "e0d98a1870a4c47978a1742beb892c051c34f9a6", "parents": [ "5456202230f331bc9ed22e62c8121e8957876be2", "288a8bb9d8e9f71b10628378bbe3eacf3a586157" ], "author": { "name": "Dennis Shen", "email": "dzshen@google.com", "time": "Tue Nov 19 05:04:48 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Nov 19 05:04:48 2024 +0000" }, "message": "Deprecate flag that guards local immediate override am: 4b19b9574c am: 288a8bb9d8\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/server_configurable_flags/+/3360068\n\nChange-Id: Id8a83bbd273a10d2a5baf8c4883f805d05cdaeb9\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "288a8bb9d8e9f71b10628378bbe3eacf3a586157", "tree": "22683150e3e8c1d85e48e2d2a1be03daa9eed409", "parents": [ "49e188e88e5eef65bc5eca60a306b921c34ae938", "4b19b9574ca2bc224256d302dd1b23b27564fef9" ], "author": { "name": "Dennis Shen", "email": "dzshen@google.com", "time": "Tue Nov 19 04:40:34 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Nov 19 04:40:34 2024 +0000" }, "message": "Deprecate flag that guards local immediate override am: 4b19b9574c\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/server_configurable_flags/+/3360068\n\nChange-Id: I2b4b624bbb9f957172c184a372c453cd9804d544\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "4b19b9574ca2bc224256d302dd1b23b27564fef9", "tree": "0b3532d085e9bcd20ec4408ae805b8e112c95b9e", "parents": [ "867caab78744d1cd0011a0535067227f930dc56f" ], "author": { "name": "Dennis Shen", "email": "dzshen@google.com", "time": "Mon Nov 18 14:50:39 2024 +0000" }, "committer": { "name": "Dennis Shen", "email": "dzshen@google.com", "time": "Mon Nov 18 14:54:44 2024 +0000" }, "message": "Deprecate flag that guards local immediate override\n\nChange-Id: I774f497f0a150a860e8e6359908b191972c2a741\n" }, { "commit": "5456202230f331bc9ed22e62c8121e8957876be2", "tree": "7cb9e473254c559f03ba386ac48872426b892da1", "parents": [ "4df3e4fcff89e483ba280f21d77981124a25c92c", "49e188e88e5eef65bc5eca60a306b921c34ae938" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Wed Nov 13 22:30:14 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Nov 13 22:30:14 2024 +0000" }, "message": "Merge \"Merge 24Q4 (ab/12406339) into aosp-main-future\" into aosp-main-future am: 49e188e88e\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/server_configurable_flags/+/3276593\n\nChange-Id: Iac258502b9ac9fe44982bd99affcda33f4a5881b\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "4df3e4fcff89e483ba280f21d77981124a25c92c", "tree": "7cb9e473254c559f03ba386ac48872426b892da1", "parents": [ "aa6b443334b8fb178eb70676142edabf1a5cc4c1", "53df6fed41666d8da693683adb66b1623548f050" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Wed Nov 13 22:30:10 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Nov 13 22:30:10 2024 +0000" }, "message": "[automerger skipped] Merge 24Q4 (ab/12406339) into aosp-main-future am: 53df6fed41 -s ours\n\nam skip reason: Merged-In Icdc3a002fb8692aec06b62b607e738e258eb3298 with SHA-1 b23a9c9150 is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/system/server_configurable_flags/+/30283860\n\nChange-Id: I484c89052ba4cb1ae8fe3866b63701427cee14a0\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "49e188e88e5eef65bc5eca60a306b921c34ae938", "tree": "bf6fd65b5b0b897f057b9713cbde1e090d428e4b", "parents": [ "b4a4bee77410018ad6255b80211f1d9be8b2d579", "53df6fed41666d8da693683adb66b1623548f050" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Wed Nov 13 21:58:51 2024 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Nov 13 21:58:51 2024 +0000" }, "message": "Merge \"Merge 24Q4 (ab/12406339) into aosp-main-future\" into aosp-main-future" }, { "commit": "aa6b443334b8fb178eb70676142edabf1a5cc4c1", "tree": "7cb9e473254c559f03ba386ac48872426b892da1", "parents": [ "e6fd132ffe3f322159de3e04640566c87e96a307", "b4a4bee77410018ad6255b80211f1d9be8b2d579" ], "author": { "name": "Marybeth Fair", "email": "marybethfair@google.com", "time": "Wed Nov 13 20:04:34 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Nov 13 20:04:34 2024 +0000" }, "message": "Demote spammy log. am: 867caab787 am: b4a4bee774\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/server_configurable_flags/+/3347386\n\nChange-Id: I2f80cd97c8485e5cafbe45172e603a58d59a5f31\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "b4a4bee77410018ad6255b80211f1d9be8b2d579", "tree": "9207e154c8c382178f02f66ec0f5541b7e8d0216", "parents": [ "467de566ccafd6d858ee70b82b20ca6085d05d53", "867caab78744d1cd0011a0535067227f930dc56f" ], "author": { "name": "Marybeth Fair", "email": "marybethfair@google.com", "time": "Wed Nov 13 19:27:50 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Nov 13 19:27:50 2024 +0000" }, "message": "Demote spammy log. am: 867caab787\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/server_configurable_flags/+/3347386\n\nChange-Id: I50438d2b32a9f4fb56f6793d05f5e01eb56421db\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "867caab78744d1cd0011a0535067227f930dc56f", "tree": "9207e154c8c382178f02f66ec0f5541b7e8d0216", "parents": [ "7bca5b59a3483a78e281a0133a19e716bd408c9b" ], "author": { "name": "Marybeth Fair", "email": "marybethfair@google.com", "time": "Wed Nov 13 11:27:03 2024 -0500" }, "committer": { "name": "Marybeth Fair", "email": "marybethfair@google.com", "time": "Wed Nov 13 16:28:20 2024 +0000" }, "message": "Demote spammy log.\n\nTest: atest only\nChange-Id: I7c19896b398a233348613d7d6e8c961c3eaa8f4f\nBug: 376068048\n" }, { "commit": "53df6fed41666d8da693683adb66b1623548f050", "tree": "5da5bf3a11de68a6b97440ff4018ea9a8ecb029a", "parents": [ "467de566ccafd6d858ee70b82b20ca6085d05d53", "5facbbc8f5e45fd0945a97bc4d36e92f65c9c086" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Mon Nov 11 14:52:13 2024 -0800" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Mon Nov 11 14:57:37 2024 -0800" }, "message": "Merge 24Q4 (ab/12406339) into aosp-main-future\n\nBug: 370570306\nMerged-In: Icdc3a002fb8692aec06b62b607e738e258eb3298\nChange-Id: Iba114466395c5b3d9ac9d39bbb66fe0b738ae55b\n" }, { "commit": "729f2978e54dbdaff1ec0afcfaee94f9fa6be0d3", "tree": "0ce721ce22e3069fb00d58c13f3312b80f608bde", "parents": [ "7bca5b59a3483a78e281a0133a19e716bd408c9b" ], "author": { "name": "Dennis Shen", "email": "dzshen@google.com", "time": "Mon Nov 11 17:41:50 2024 +0000" }, "committer": { "name": "Dennis Shen", "email": "dzshen@google.com", "time": "Mon Nov 11 17:41:50 2024 +0000" }, "message": "move aconfigd platform init service into aconfigd.rc\n\nBug: 378079539\nTest: m\nChange-Id: I05f1347d7029e2e3ad48005d49b8262a4860aca3\n" }, { "commit": "e6fd132ffe3f322159de3e04640566c87e96a307", "tree": "b93f437466e9bafde093f6d507881036739fc37c", "parents": [ "0839faafd46a97ac43159e0e5706bd27811f6ae7", "467de566ccafd6d858ee70b82b20ca6085d05d53" ], "author": { "name": "Dennis Shen", "email": "dzshen@google.com", "time": "Mon Nov 11 02:30:07 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Nov 11 02:30:07 2024 +0000" }, "message": "remove aconfigd-system rust binary from coverage build while build am: 7bca5b59a3 am: 467de566cc\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/server_configurable_flags/+/3341428\n\nChange-Id: Ie3fa7993a7abe82dad7038a802bec9648aad6745\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "467de566ccafd6d858ee70b82b20ca6085d05d53", "tree": "58a0d4ca0f4bfdeb2fad257bac131d0a1f9b2611", "parents": [ "74aa43d5daa062b56d2c0d947161afb653f49f0f", "7bca5b59a3483a78e281a0133a19e716bd408c9b" ], "author": { "name": "Dennis Shen", "email": "dzshen@google.com", "time": "Mon Nov 11 01:55:13 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Nov 11 01:55:13 2024 +0000" }, "message": "remove aconfigd-system rust binary from coverage build while build am: 7bca5b59a3\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/server_configurable_flags/+/3341428\n\nChange-Id: I492230ce923cfbfd1cc5d964a68a83a1d4ec5e29\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "0839faafd46a97ac43159e0e5706bd27811f6ae7", "tree": "e5912096b9bc21fff9b313ab334d82d08cb18e03", "parents": [ "760d08aa50ba726efaa1e1b3a79b3f36a6802903", "74aa43d5daa062b56d2c0d947161afb653f49f0f" ], "author": { "name": "Dennis Shen", "email": "dzshen@google.com", "time": "Sun Nov 10 20:53:40 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Sun Nov 10 20:53:40 2024 +0000" }, "message": "Fix test failures am: b5dcbf77cf am: 74aa43d5da\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/server_configurable_flags/+/3344402\n\nChange-Id: Id8e254869649797296737ab8a1c546d5e4495fdc\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "74aa43d5daa062b56d2c0d947161afb653f49f0f", "tree": "aff3be26ba94b446239722d55fb74c2da758b949", "parents": [ "056143840a2f684cfdf9c5bf8c6379fa7d1cf297", "b5dcbf77cf61715e93e9857ef0e0792951217691" ], "author": { "name": "Dennis Shen", "email": "dzshen@google.com", "time": "Sun Nov 10 20:31:42 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Sun Nov 10 20:31:42 2024 +0000" }, "message": "Fix test failures am: b5dcbf77cf\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/server_configurable_flags/+/3344402\n\nChange-Id: I75db9409eaa86aa410284d7535fb2a2add7c9932\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "7bca5b59a3483a78e281a0133a19e716bd408c9b", "tree": "58a0d4ca0f4bfdeb2fad257bac131d0a1f9b2611", "parents": [ "b5dcbf77cf61715e93e9857ef0e0792951217691" ], "author": { "name": "Dennis Shen", "email": "dzshen@google.com", "time": "Fri Nov 08 18:39:07 2024 +0000" }, "committer": { "name": "Dennis Shen", "email": "dzshen@google.com", "time": "Sun Nov 10 19:59:07 2024 +0000" }, "message": "remove aconfigd-system rust binary from coverage build while build\nsystem fix is being worked on, in order to unblock current work.\n\nBug: b/327170179\nTest: m\nChange-Id: I2810a7a77fefbea0120fb10de69c1b24c1ee06e4\n" }, { "commit": "760d08aa50ba726efaa1e1b3a79b3f36a6802903", "tree": "c7564daa1bdbe8fa1d41ca4fdc28eb9bb69d9fb2", "parents": [ "6210e62440175749f392362438a91f1cea51bb4f", "056143840a2f684cfdf9c5bf8c6379fa7d1cf297" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Fri Nov 08 21:53:53 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Nov 08 21:53:53 2024 +0000" }, "message": "[automerger skipped] Merge \"Switch from aconfigd to aconfigd-system on flag flip\" into main am: 40ace609a0 am: 056143840a -s ours\n\nam skip reason: Merged-In I8125e8c5647e313e9004517cb3f200c1e565d118 with SHA-1 6210e62440 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/server_configurable_flags/+/3343803\n\nChange-Id: I77ffbb739f39106112095fb46a0d1232199dd1fc\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "056143840a2f684cfdf9c5bf8c6379fa7d1cf297", "tree": "d3a071c592de9770142d315541f8c0ae4ff35ed1", "parents": [ "96dd5a546a8df7f8ae91a4f60b3ab0ba1a2733dc", "40ace609a0be2b92b41eaaaea3f36b8f0c032b92" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Fri Nov 08 21:43:18 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Nov 08 21:43:18 2024 +0000" }, "message": "Merge \"Switch from aconfigd to aconfigd-system on flag flip\" into main am: 40ace609a0\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/server_configurable_flags/+/3343803\n\nChange-Id: I343329858be15a26ff9365f4abe19d5319975f52\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "b5dcbf77cf61715e93e9857ef0e0792951217691", "tree": "aff3be26ba94b446239722d55fb74c2da758b949", "parents": [ "40ace609a0be2b92b41eaaaea3f36b8f0c032b92" ], "author": { "name": "Dennis Shen", "email": "dzshen@google.com", "time": "Fri Nov 08 21:29:57 2024 +0000" }, "committer": { "name": "Dennis Shen", "email": "dzshen@google.com", "time": "Fri Nov 08 21:33:43 2024 +0000" }, "message": "Fix test failures\n\nBug: b/378134110\nTest: ABTD\nChange-Id: Icf2e09b61cd6fb726b38a898156c0c929f5218c5\n" }, { "commit": "40ace609a0be2b92b41eaaaea3f36b8f0c032b92", "tree": "d3a071c592de9770142d315541f8c0ae4ff35ed1", "parents": [ "7a8a4d546bc461b8bacefd568b2358df083edc66", "e81ab2f01f4283bbe68224d63199ed7f413dcc96" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Fri Nov 08 21:32:55 2024 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Fri Nov 08 21:32:55 2024 +0000" }, "message": "Merge \"Switch from aconfigd to aconfigd-system on flag flip\" into main" }, { "commit": "e81ab2f01f4283bbe68224d63199ed7f413dcc96", "tree": "72c0afddb3dd2d65665ddc90a599190077e34cb3", "parents": [ "a777c5d5a7bd57612bf9f7a584312d864506a916" ], "author": { "name": "Ted Bauer", "email": "tedbauer@google.com", "time": "Fri Nov 08 15:02:14 2024 +0000" }, "committer": { "name": "Ted Bauer", "email": "tedbauer@google.com", "time": "Fri Nov 08 20:32:30 2024 +0000" }, "message": "Switch from aconfigd to aconfigd-system on flag flip\n\nBug: 378079539\nTest: manually confirmed with flag overridden locally\nChange-Id: I8125e8c5647e313e9004517cb3f200c1e565d118\nMerged-In: I8125e8c5647e313e9004517cb3f200c1e565d118\n" }, { "commit": "6210e62440175749f392362438a91f1cea51bb4f", "tree": "c7564daa1bdbe8fa1d41ca4fdc28eb9bb69d9fb2", "parents": [ "4eac9f91c53eca45c705668d77400ba1b316919a" ], "author": { "name": "Ted Bauer", "email": "tedbauer@google.com", "time": "Fri Nov 08 18:42:39 2024 +0000" }, "committer": { "name": "Cherrypicker Worker", "email": "android-build-cherrypicker-worker@google.com", "time": "Fri Nov 08 18:42:39 2024 +0000" }, "message": "Switch from aconfigd to aconfigd-system on flag flip\n\nBug: 378079539\nTest: manually confirmed with flag overridden locally\n(cherry picked from https://android-review.googlesource.com/q/commit:45be4327c0591579c1f4cd5fc10050ed2d7eaa31)\nMerged-In: I8125e8c5647e313e9004517cb3f200c1e565d118\nChange-Id: I8125e8c5647e313e9004517cb3f200c1e565d118\n" }, { "commit": "4eac9f91c53eca45c705668d77400ba1b316919a", "tree": "fdd2faed42aec08c1962270df34d201400a73e58", "parents": [ "580191fe7e812efbbdaca2e2b71dbdfad1072617", "96dd5a546a8df7f8ae91a4f60b3ab0ba1a2733dc" ], "author": { "name": "Dennis Shen", "email": "dzshen@google.com", "time": "Fri Nov 08 18:29:20 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Nov 08 18:29:20 2024 +0000" }, "message": "Merge \"Fix aconfigd showmap rss regression\" into main am: 7a8a4d546b am: 96dd5a546a\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/server_configurable_flags/+/3341436\n\nChange-Id: Iec1832ee9554173262eca8c60b1119df0fd58748\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "96dd5a546a8df7f8ae91a4f60b3ab0ba1a2733dc", "tree": "03860faa2e306297adacac8a9ee3bdc200eedd95", "parents": [ "544f8331a54b335b6346649703efe405956aab3a", "7a8a4d546bc461b8bacefd568b2358df083edc66" ], "author": { "name": "Dennis Shen", "email": "dzshen@google.com", "time": "Fri Nov 08 18:07:54 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Nov 08 18:07:54 2024 +0000" }, "message": "Merge \"Fix aconfigd showmap rss regression\" into main am: 7a8a4d546b\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/server_configurable_flags/+/3341436\n\nChange-Id: I35da8245046802c688f78a503ac650aa2ae49a80\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "7a8a4d546bc461b8bacefd568b2358df083edc66", "tree": "03860faa2e306297adacac8a9ee3bdc200eedd95", "parents": [ "a777c5d5a7bd57612bf9f7a584312d864506a916", "831f5028058993a04488a1139d6816be93fbb984" ], "author": { "name": "Dennis Shen", "email": "dzshen@google.com", "time": "Fri Nov 08 17:31:54 2024 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Fri Nov 08 17:31:54 2024 +0000" }, "message": "Merge \"Fix aconfigd showmap rss regression\" into main" }, { "commit": "831f5028058993a04488a1139d6816be93fbb984", "tree": "102f6571247c447dccb60d6dea6ea43803563cb3", "parents": [ "459fb2e8f45222bf44e4d2ff0eb69874f2c5f331" ], "author": { "name": "Dennis Shen", "email": "dzshen@google.com", "time": "Thu Nov 07 15:46:11 2024 +0000" }, "committer": { "name": "Dennis Shen", "email": "dzshen@google.com", "time": "Fri Nov 08 15:13:29 2024 +0000" }, "message": "Fix aconfigd showmap rss regression\n\nBug: 377780532\nTest: ABTD\nChange-Id: I9974eb38b656c346c91baf0525a674d6bf20af94\n" }, { "commit": "580191fe7e812efbbdaca2e2b71dbdfad1072617", "tree": "9d2d8718eed01120f028ebfaa51ce713ef13b84d", "parents": [ "58f25faa8cbcd4599915eac7c6cab21cd83b99c1", "544f8331a54b335b6346649703efe405956aab3a" ], "author": { "name": "Ted Bauer", "email": "tedbauer@google.com", "time": "Fri Nov 08 14:54:41 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Nov 08 14:54:41 2024 +0000" }, "message": "Call C++ aconfigd implementation from Rust binary am: a777c5d5a7 am: 544f8331a5\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/server_configurable_flags/+/3341699\n\nChange-Id: I17f6f36b2416647bf57ada6e18d0545745a1b418\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "544f8331a54b335b6346649703efe405956aab3a", "tree": "f273bb7ecd6445e15a2e84a7eeba5c42960ce12b", "parents": [ "91cc3db81dc0fc84bf9c2c5a3e93503768ee0473", "a777c5d5a7bd57612bf9f7a584312d864506a916" ], "author": { "name": "Ted Bauer", "email": "tedbauer@google.com", "time": "Fri Nov 08 14:32:27 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Nov 08 14:32:27 2024 +0000" }, "message": "Call C++ aconfigd implementation from Rust binary am: a777c5d5a7\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/server_configurable_flags/+/3341699\n\nChange-Id: I795147a9e1161c66a529403a70e78e27c326732a\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "a777c5d5a7bd57612bf9f7a584312d864506a916", "tree": "f273bb7ecd6445e15a2e84a7eeba5c42960ce12b", "parents": [ "459fb2e8f45222bf44e4d2ff0eb69874f2c5f331" ], "author": { "name": "Ted Bauer", "email": "tedbauer@google.com", "time": "Fri Nov 08 00:11:00 2024 +0000" }, "committer": { "name": "Ted Bauer", "email": "tedbauer@google.com", "time": "Fri Nov 08 00:31:55 2024 +0000" }, "message": "Call C++ aconfigd implementation from Rust binary\n\nTo begin migrating the system aconfigd to Rust, make a Rust binary that\nreads and writes socket messages, and defers the rest of the work to the\nC++ aconfigd implementation.\n\nThe Rust binary is not used anywhere, so this CL introduces no behavioral\nchange yet. Follow-up flag-guarded CLs will start the binary from init.rc.\n\nTest: manually confirmed that platform and storage files are created\nTest: manually confirmed that socket can send and receive messages\nBug: 370499640\nChange-Id: I41590115fda4cad69a9c0dd60253fce460b75c05\n" }, { "commit": "58f25faa8cbcd4599915eac7c6cab21cd83b99c1", "tree": "ab50c850fe6e2c499eaaf2b07412b29b61da3f68", "parents": [ "ca905ab99def6732f4095c9f73218a325dfa0c50", "91cc3db81dc0fc84bf9c2c5a3e93503768ee0473" ], "author": { "name": "Dennis Shen", "email": "dzshen@google.com", "time": "Tue Nov 05 19:29:31 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Nov 05 19:29:31 2024 +0000" }, "message": "aconfigd: create a rust binary target aconfigd_system am: 459fb2e8f4 am: 91cc3db81d\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/server_configurable_flags/+/3331655\n\nChange-Id: I3c8797b585b776416d404674bf882b2a66ed9923\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "91cc3db81dc0fc84bf9c2c5a3e93503768ee0473", "tree": "dc9d9266493b510850ade8c31440935612a20689", "parents": [ "16d8844c1b397139cbf4ba70a4b836f584aa30fa", "459fb2e8f45222bf44e4d2ff0eb69874f2c5f331" ], "author": { "name": "Dennis Shen", "email": "dzshen@google.com", "time": "Tue Nov 05 19:04:44 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Nov 05 19:04:44 2024 +0000" }, "message": "aconfigd: create a rust binary target aconfigd_system am: 459fb2e8f4\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/server_configurable_flags/+/3331655\n\nChange-Id: I4183bb4391826ebcc0d67d16d8eda277f3cd9807\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "ca905ab99def6732f4095c9f73218a325dfa0c50", "tree": "7005543371609e656dcb24429a463009f3685b5b", "parents": [ "9661c2da2b31311d789281636045068155845ed5", "16d8844c1b397139cbf4ba70a4b836f584aa30fa" ], "author": { "name": "Dennis Shen", "email": "dzshen@google.com", "time": "Mon Nov 04 23:43:44 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Nov 04 23:43:44 2024 +0000" }, "message": "[automerger skipped] aconfigd: split aconfig cc_binary into a cc_binary + a cc_library am: 32d5b011e1 am: 16d8844c1b -s ours\n\nam skip reason: Merged-In I0079f8b82aac30eb74eee76523a4bb01a14d3e97 with SHA-1 9661c2da2b is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/server_configurable_flags/+/3332073\n\nChange-Id: I0c0169725fcdc25ac01f2d1934609bcb5dddb9f5\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "16d8844c1b397139cbf4ba70a4b836f584aa30fa", "tree": "64fd4394314e5d2e07d79d772cc383582884ccbf", "parents": [ "70352a91e7fd4726cd24b8606500eb0b9d250cf0", "32d5b011e1cc69dcd7dc12906d75f51213ebb21f" ], "author": { "name": "Dennis Shen", "email": "dzshen@google.com", "time": "Mon Nov 04 23:20:26 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Nov 04 23:20:26 2024 +0000" }, "message": "aconfigd: split aconfig cc_binary into a cc_binary + a cc_library am: 32d5b011e1\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/server_configurable_flags/+/3332073\n\nChange-Id: Ic756f4757662e765e1be1aa8bac7affbed73186e\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "459fb2e8f45222bf44e4d2ff0eb69874f2c5f331", "tree": "dc9d9266493b510850ade8c31440935612a20689", "parents": [ "32d5b011e1cc69dcd7dc12906d75f51213ebb21f" ], "author": { "name": "Dennis Shen", "email": "dzshen@google.com", "time": "Mon Nov 04 20:15:04 2024 +0000" }, "committer": { "name": "Dennis Shen", "email": "dzshen@google.com", "time": "Mon Nov 04 22:34:34 2024 +0000" }, "message": "aconfigd: create a rust binary target aconfigd_system\n\nThis binary will rely on cc_library libaconfigd in the short term. But\nsocket marshaling logic are all in rust.\n\nBug: b/327170179\nTest: m\nChange-Id: Ic6dfc3e63c6fa790b4f50dac41b7927b5f94151e\n" }, { "commit": "32d5b011e1cc69dcd7dc12906d75f51213ebb21f", "tree": "64fd4394314e5d2e07d79d772cc383582884ccbf", "parents": [ "08e73d8019d4b47abacaf20ba87135a0c5114129" ], "author": { "name": "Dennis Shen", "email": "dzshen@google.com", "time": "Mon Nov 04 19:00:02 2024 +0000" }, "committer": { "name": "Dennis Shen", "email": "dzshen@google.com", "time": "Mon Nov 04 20:13:58 2024 +0000" }, "message": "aconfigd: split aconfig cc_binary into a cc_binary + a cc_library\n\nThis is the first step to replace socket marshalling with Rust\nimplementation.\n\nBug: b/327170179\nTest: atest -c\nChange-Id: I0079f8b82aac30eb74eee76523a4bb01a14d3e97\nMerged-In: I0079f8b82aac30eb74eee76523a4bb01a14d3e97\n" }, { "commit": "9661c2da2b31311d789281636045068155845ed5", "tree": "7005543371609e656dcb24429a463009f3685b5b", "parents": [ "d1cc6d6199243113ae60c63156eb498a99ae2746" ], "author": { "name": "Dennis Shen", "email": "dzshen@google.com", "time": "Mon Nov 04 19:00:02 2024 +0000" }, "committer": { "name": "Dennis Shen", "email": "dzshen@google.com", "time": "Mon Nov 04 20:11:23 2024 +0000" }, "message": "aconfigd: split aconfig cc_binary into a cc_binary + a cc_library\n\nThis is the first step to replace socket marshalling with Rust\nimplementation.\n\nBug: b/327170179\nTest: atest -c\nChange-Id: I0079f8b82aac30eb74eee76523a4bb01a14d3e97\n" }, { "commit": "d1cc6d6199243113ae60c63156eb498a99ae2746", "tree": "44d7baf5c306cfd6eaf466bb570f6a82348d3d2b", "parents": [ "909fd9980982f2751cf8f72f4f5edadefb3269d4", "691fd56316d410d6488a9fe704869822308ef462" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Mon Nov 04 10:58:34 2024 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Nov 04 10:58:34 2024 +0000" }, "message": "Merge \"Move aconfigd log messages to DEBUG\" into main" }, { "commit": "909fd9980982f2751cf8f72f4f5edadefb3269d4", "tree": "aa2c13ae4b06925db31638477faedc8f33724a85", "parents": [ "77c31dbb21ae7a0e17a7fe21feb672d7ad105bcd" ], "author": { "name": "Ted Bauer", "email": "tedbauer@google.com", "time": "Wed Oct 30 16:42:12 2024 +0000" }, "committer": { "name": "Ted Bauer", "email": "tedbauer@google.com", "time": "Fri Nov 01 15:05:30 2024 +0000" }, "message": "Support clearing overrides immediately in aconfigd\n\nFlag: com.android.aconfig_new_storage.support_clear_local_overrides_immediately\nChange-Id: If2fdcc349f659bce8739d1b4083bf1717d82ef60\nTest: flexiglass reset\nBug: 360205436\n" }, { "commit": "691fd56316d410d6488a9fe704869822308ef462", "tree": "134fab0b4d54d4acf2416fb37c0a13987e36059f", "parents": [ "77c31dbb21ae7a0e17a7fe21feb672d7ad105bcd" ], "author": { "name": "Ted Bauer", "email": "tedbauer@google.com", "time": "Thu Oct 31 21:01:53 2024 +0000" }, "committer": { "name": "Ted Bauer", "email": "tedbauer@google.com", "time": "Thu Oct 31 21:01:53 2024 +0000" }, "message": "Move aconfigd log messages to DEBUG\n\nChange-Id: I82ba109bb180a5e99f6ad86414e5309c5e960bdc\nTest: m\nBug: 370046610\n" }, { "commit": "77c31dbb21ae7a0e17a7fe21feb672d7ad105bcd", "tree": "0dd5b734b95bd00d7eba9b30b05bfc07390b99a4", "parents": [ "4c8396b814ed3509107e52cbfa3011ff057d78c3" ], "author": { "name": "Nick Kralevich", "email": "nnk@google.com", "time": "Thu Oct 24 10:21:09 2024 -0700" }, "committer": { "name": "Nick Kralevich", "email": "nnk@google.com", "time": "Thu Oct 24 10:27:55 2024 -0700" }, "message": "aconfigd: Run some tests as root\n\nWhere required, run aconfigd tests as root. This addresses\nbreakage caused by system/sepolicy commit\n62bcb0da58348979d291d8339f17a2a3bb1febe1 which removed the\nability of the unprivileged shell user to execute these\ntests.\n\nWhile I\u0027m here, in the aconfigd_test testcase, move\nlibaconfig_flags_cc from shared to static libs. Otherwise, an\nattempt to run this test from atest fails with the following\nerror:\n\n arm64-v8a aconfigd_test\n -----------------------\n aconfigd_test (0 Tests)\n RUNNER ERROR: aconfigd_test did not report any run:\n CANNOT LINK EXECUTABLE \"/data/local/tmp/aconfigd_test/arm64/aconfigd_test\": library \"libaconfig_flags_cc.so\" not found: needed by main executable\n\nTest: atest aconfigd_socket_test aconfigd_test aconfigd_proton_collider_test\nChange-Id: I756b7c50fa29f0a3d4896137a9e43c4197856edd\n" }, { "commit": "4c8396b814ed3509107e52cbfa3011ff057d78c3", "tree": "e0b1bc925546873c3e2227ace3c4a9e5731eef0d", "parents": [ "830ff7c4748eae576a060fbf3e43dcbc1db24882", "70352a91e7fd4726cd24b8606500eb0b9d250cf0" ], "author": { "name": "Marybeth Fair", "email": "marybethfair@google.com", "time": "Mon Oct 07 20:25:40 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Oct 07 20:25:40 2024 +0000" }, "message": "Merge \"Move more test data into separate v1/v2 folders.\" into main am: 08e73d8019 am: 70352a91e7\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/server_configurable_flags/+/3294491\n\nChange-Id: I1060bf56a87a73bf8848559ed53ea3284c768ade\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "70352a91e7fd4726cd24b8606500eb0b9d250cf0", "tree": "6578e806fb11888d003a0cb91cc1cc8c3f012fe3", "parents": [ "0f1402be78fcd90cea85881bca2a8e71b316b886", "08e73d8019d4b47abacaf20ba87135a0c5114129" ], "author": { "name": "Marybeth Fair", "email": "marybethfair@google.com", "time": "Mon Oct 07 19:53:10 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Oct 07 19:53:10 2024 +0000" }, "message": "Merge \"Move more test data into separate v1/v2 folders.\" into main am: 08e73d8019\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/server_configurable_flags/+/3294491\n\nChange-Id: I4274da33faddfca41a747d58ef092863ac2652bb\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "08e73d8019d4b47abacaf20ba87135a0c5114129", "tree": "6578e806fb11888d003a0cb91cc1cc8c3f012fe3", "parents": [ "69f039a985a9cbbe82fdacae25172d2ed2ddc213", "6f42c6d60967dcf138236230fefcad6557116729" ], "author": { "name": "Marybeth Fair", "email": "marybethfair@google.com", "time": "Mon Oct 07 19:35:33 2024 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Mon Oct 07 19:35:33 2024 +0000" }, "message": "Merge \"Move more test data into separate v1/v2 folders.\" into main" }, { "commit": "830ff7c4748eae576a060fbf3e43dcbc1db24882", "tree": "c13c99acb4f3c18acba5cad7e49939a2184be2f6", "parents": [ "cfb715e6edace8a157758d3cdaf9240cb9e8009a", "0f1402be78fcd90cea85881bca2a8e71b316b886" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Fri Oct 04 21:19:21 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Oct 04 21:19:21 2024 +0000" }, "message": "Merge \"Revert^2 \"Add cts_flags_tests_cc to aconfigd\"\" into main am: 69f039a985 am: 0f1402be78\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/server_configurable_flags/+/3294412\n\nChange-Id: I56794db859bf015a60365babcb9f7ff7871915d3\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "cfb715e6edace8a157758d3cdaf9240cb9e8009a", "tree": "f97359ff4c6497e37980539dc92c875bb7c35447", "parents": [ "861d05fb3286a0788233460bc2103cec56843b1c", "ffe56229d7b4bf63d0f49fe74078e4b70be5d439" ], "author": { "name": "Dennis Shen", "email": "dzshen@google.com", "time": "Fri Oct 04 21:19:04 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Oct 04 21:19:04 2024 +0000" }, "message": "[automerger skipped] Merge \"aconfigd: migrate aconfigd proto build targets to config infra module\" into main am: 762a8de256 am: ffe56229d7 -s ours\n\nam skip reason: Merged-In I8cfe84476cccb0097b35f21c9ccb0837cead9a89 with SHA-1 4ab41dc62d is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/server_configurable_flags/+/3290963\n\nChange-Id: I9ec7979227dec052eda0dec3df9aee5aa3bc42b3\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "0f1402be78fcd90cea85881bca2a8e71b316b886", "tree": "85869f7bc9ff57ce38d33ca02868e49a3279d950", "parents": [ "ffe56229d7b4bf63d0f49fe74078e4b70be5d439", "69f039a985a9cbbe82fdacae25172d2ed2ddc213" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Fri Oct 04 20:51:55 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Oct 04 20:51:55 2024 +0000" }, "message": "Merge \"Revert^2 \"Add cts_flags_tests_cc to aconfigd\"\" into main am: 69f039a985\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/server_configurable_flags/+/3294412\n\nChange-Id: If2b1ccb3c26e5cfb023798113c99539c66e93a2c\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "ffe56229d7b4bf63d0f49fe74078e4b70be5d439", "tree": "3f59a0e7f3487aead33fd83bcea12bb1ed12037f", "parents": [ "5adb28b73270be33c4305f1d5ac3802607ea6143", "762a8de2569b7be6690cad3458abfad549c6fea9" ], "author": { "name": "Dennis Shen", "email": "dzshen@google.com", "time": "Fri Oct 04 20:51:32 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Oct 04 20:51:32 2024 +0000" }, "message": "Merge \"aconfigd: migrate aconfigd proto build targets to config infra module\" into main am: 762a8de256\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/server_configurable_flags/+/3290963\n\nChange-Id: I882d88a0817fc9b5c5cde004d9c77383baad1faa\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" } ], "next": "69f039a985a9cbbe82fdacae25172d2ed2ddc213" }