aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2024-04-05Merge "Remove dnssd module." into mainHEADmastermainTreehugger Robot
2024-04-05Remove dnssd module.Elliott Hughes
Nothing uses this. Change-Id: I4bbb8510b7c8acfdaa87ad7b0f47b17457593235
2024-01-02Merge "Fix a mdns coverity issue to avoid RESOURCE_LEAK" into main am: ↵Shaju Mathew
15afa33f8e am: be172eab0a am: 50b2dec70e Original change: https://android-review.googlesource.com/c/platform/external/mdnsresponder/+/2834190 Change-Id: Ie2276f8b1e960383b657d5c4d74eb9359f74810c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-02Merge "Fix a mdns coverity issue to avoid RESOURCE_LEAK" into main am: ↵Shaju Mathew
15afa33f8e am: be172eab0a Original change: https://android-review.googlesource.com/c/platform/external/mdnsresponder/+/2834190 Change-Id: I08e99aa5655105f0fd72e0f09a9a00bd369a33aa Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-02Merge "Fix a mdns coverity issue to avoid RESOURCE_LEAK" into main am: ↵Shaju Mathew
15afa33f8e Original change: https://android-review.googlesource.com/c/platform/external/mdnsresponder/+/2834190 Change-Id: Id7f710d5e436419a43d9964e9c6f75d7e2df8bc9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-02Merge "Fix a mdns coverity issue to avoid RESOURCE_LEAK" into mainShaju Mathew
2023-12-19Fix a mdns coverity issue to avoid RESOURCE_LEAKjiangpingping
Bug: 312268760 [Description] sock not close before return if addr type is not ipv4 or ipv6. This will cause a RESOURCE_LEAK coverity issue. [Solution] close open socket before return Change-Id: I81dbb8663cd10169cbf106846eb1a0b4318ee050 Signed-off-by: jiangpingping <jiangpingping@xiaomi.com>
2023-12-14Merge "Restrict visibility to adb/adbmini" into main am: ab25584713 am: ↵Treehugger Robot
085087f8ee am: a37b3bd5b9 Original change: https://android-review.googlesource.com/c/platform/external/mdnsresponder/+/2874698 Change-Id: Ic95db8d80bf32d487f8f13ad7229f4448bdb7c16 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-14Merge "Restrict visibility to adb/adbmini" into main am: ab25584713 am: ↵Treehugger Robot
085087f8ee Original change: https://android-review.googlesource.com/c/platform/external/mdnsresponder/+/2874698 Change-Id: I859f27d9db32a506a42ad21e892a38cae3144f7b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-14Merge "Restrict visibility to adb/adbmini" into main am: ab25584713Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/mdnsresponder/+/2874698 Change-Id: I761dcb43e8e1b55fb9364f899f5fea8b6b4b3922 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-14Merge changes Ie32ee0a8,I66c08e68 into main am: 7ae223e7de am: 8b0994c5f8 ↵Yuyang Huang
am: 79bf54e016 Original change: https://android-review.googlesource.com/c/platform/external/mdnsresponder/+/2874315 Change-Id: Ic9d2970b6567cd8fe50da94918b26bd10cc8ce4b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-14Merge "Restrict visibility to adb/adbmini" into mainTreehugger Robot
2023-12-14Merge changes Ie32ee0a8,I66c08e68 into main am: 7ae223e7de am: 8b0994c5f8Yuyang Huang
Original change: https://android-review.googlesource.com/c/platform/external/mdnsresponder/+/2874315 Change-Id: I9f32fc6b1819e7025d971fcbdfacc656308b221f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-14Merge changes Ie32ee0a8,I66c08e68 into main am: 7ae223e7deYuyang Huang
Original change: https://android-review.googlesource.com/c/platform/external/mdnsresponder/+/2874315 Change-Id: I02e56a378ececc6024167bdb57c39685dd54d0e0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-14Restrict visibility to adb/adbminiFabien Sanglard
Test: NA Change-Id: I3c92d56045a0f5f770a3c4ac87bac221b8125d3d
2023-12-14Merge changes Ie32ee0a8,I66c08e68 into mainYuyang Huang
* changes: Add sanglardf to OWNERS Remove Core Networking team from mdnsresponder owner file
2023-12-14Add sanglardf to OWNERSFabien Sanglard
Test: NA Bug: NA Change-Id: Ie32ee0a8be9d0df73a40f6e6feefeca8cb7a5cf5
2023-12-14Remove Core Networking team from mdnsresponder owner fileYuyang Huang
Test: TH Change-Id: I66c08e68e76b6f01004f0db9ade3bb212fb37a3d
2023-07-18Merge "Move OWNER reference master=>main." into main am: de7edc4b1a am: ↵android-14.0.0_r37android-14.0.0_r36android-14.0.0_r35android-14.0.0_r34android-14.0.0_r33android-14.0.0_r32android-14.0.0_r31android-14.0.0_r30android-14.0.0_r29android14-qpr2-s5-releaseandroid14-qpr2-s4-releaseandroid14-qpr2-s3-releaseandroid14-qpr2-s2-releaseandroid14-qpr2-s1-releaseandroid14-qpr2-releaseSam Saccone
e7051b0be9 am: 11b8066143 am: 468cc1b5c1 am: 9d01cd9922 Original change: https://android-review.googlesource.com/c/platform/external/mdnsresponder/+/2661300 Change-Id: If23b623a7ddfdffcd66d0259be50eee0350b05b1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-18Merge "Move OWNER reference master=>main." into main am: de7edc4b1a am: ↵Sam Saccone
e7051b0be9 am: 11b8066143 am: 468cc1b5c1 Original change: https://android-review.googlesource.com/c/platform/external/mdnsresponder/+/2661300 Change-Id: I737195c4dabc92ccc36d7f370f2046c487b5844e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-18Merge "Move OWNER reference master=>main." into main am: de7edc4b1a am: ↵Sam Saccone
e7051b0be9 am: 11b8066143 Original change: https://android-review.googlesource.com/c/platform/external/mdnsresponder/+/2661300 Change-Id: Ic61952d1ca24577e2e9cbdffc425564a2aefb177 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-18Merge "Move OWNER reference master=>main." into main am: de7edc4b1a am: ↵Sam Saccone
e7051b0be9 Original change: https://android-review.googlesource.com/c/platform/external/mdnsresponder/+/2661300 Change-Id: I833422c00dd411e133b6b02c6965b682c522f88a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-18Merge "Move OWNER reference master=>main." into main am: de7edc4b1aSam Saccone
Original change: https://android-review.googlesource.com/c/platform/external/mdnsresponder/+/2661300 Change-Id: Ie7e3e7e4c3546224fa1123d6087e7a6f8959bc1f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-18Merge "Move OWNER reference master=>main." into mainSam Saccone
2023-07-18Move OWNER reference master=>main.Sam Saccone
BUG=b/291759353 Change-Id: I0ba68f6cfa503aa9b3a6ce9ab397bfff6f372075
2023-03-08[automerger skipped] Fix UWB start/stop ranging causing mDNS drop am: ↵Ante
9576bf0640 -s ours am: c282fc45c2 -s ours am: 7036dd3fee -s ours am: e80cf19149 -s ours am skip reason: Merged-In I1c070d989769752fda92bbe9308ca5bfc7c2d3e5 with SHA-1 b63cb20590 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/mdnsresponder/+/21805065 Change-Id: Icd838fc9a2ffcec7ec91bcb47dea2e5ba55a59a6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-08[automerger skipped] Fix UWB start/stop ranging causing mDNS drop am: ↵Ante
9576bf0640 -s ours am: c282fc45c2 -s ours am: 7036dd3fee -s ours am: cfd78b7fe7 -s ours am skip reason: Merged-In I1c070d989769752fda92bbe9308ca5bfc7c2d3e5 with SHA-1 b63cb20590 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/mdnsresponder/+/21805065 Change-Id: I27e3b94e750106064456819dd949942e82ab4ce0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-08[automerger skipped] Fix UWB start/stop ranging causing mDNS drop am: ↵android-14.0.0_r45android-14.0.0_r44android-14.0.0_r43android-14.0.0_r42android-14.0.0_r41android-14.0.0_r40android-14.0.0_r39android-14.0.0_r38android-14.0.0_r27android-14.0.0_r26android-14.0.0_r25android-14.0.0_r24android-14.0.0_r23android-14.0.0_r22android-14.0.0_r21android-14.0.0_r20android-14.0.0_r19android-14.0.0_r18android-14.0.0_r17android-14.0.0_r16android14-qpr1-s2-releaseandroid14-qpr1-releaseandroid14-d2-s5-releaseandroid14-d2-s4-releaseandroid14-d2-s3-releaseandroid14-d2-s2-releaseandroid14-d2-s1-releaseandroid14-d2-releaseAnte
9576bf0640 -s ours am: c282fc45c2 -s ours am: 7036dd3fee -s ours am skip reason: Merged-In I1c070d989769752fda92bbe9308ca5bfc7c2d3e5 with SHA-1 b63cb20590 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/mdnsresponder/+/21805065 Change-Id: I07c2e36373486ed45bf9b43920c8bc7419ea0108 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-08[automerger skipped] Fix UWB start/stop ranging causing mDNS drop am: ↵Ante
9576bf0640 -s ours am: c282fc45c2 -s ours am: 7036dd3fee -s ours am skip reason: Merged-In I1c070d989769752fda92bbe9308ca5bfc7c2d3e5 with SHA-1 b63cb20590 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/mdnsresponder/+/21805065 Change-Id: I1a8b3d834c3520a9191465613d3521c68ab6e21b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-08[automerger skipped] Fix UWB start/stop ranging causing mDNS drop am: ↵android14-devAnte
9576bf0640 -s ours am: c282fc45c2 -s ours am skip reason: Merged-In I1c070d989769752fda92bbe9308ca5bfc7c2d3e5 with SHA-1 b63cb20590 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/mdnsresponder/+/21805065 Change-Id: I4a974d41693f76adeb72f4ec963daf27bdda68fe Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-08[automerger skipped] Fix UWB start/stop ranging causing mDNS drop am: ↵Ante
9576bf0640 -s ours am skip reason: Merged-In I1c070d989769752fda92bbe9308ca5bfc7c2d3e5 with SHA-1 b63cb20590 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/mdnsresponder/+/21805065 Change-Id: I557c4466e76fa11cd6b40e6681d1818eb2b6d486 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-07Fix UWB start/stop ranging causing mDNS dropandroid-13.0.0_r82android-13.0.0_r81android-13.0.0_r80android-13.0.0_r74android-13.0.0_r73android-13.0.0_r72android-13.0.0_r66android-13.0.0_r65android-13.0.0_r64android-13.0.0_r60android-13.0.0_r59android-13.0.0_r58android13-qpr3-c-s8-releaseandroid13-qpr3-c-s7-releaseandroid13-qpr3-c-s6-releaseandroid13-qpr3-c-s5-releaseandroid13-qpr3-c-s4-releaseandroid13-qpr3-c-s3-releaseandroid13-qpr3-c-s2-releaseandroid13-qpr3-c-s12-releaseandroid13-qpr3-c-s11-releaseandroid13-qpr3-c-s10-releaseandroid13-qpr3-c-s1-releaseAnte
Cherry-pick from aosp/2463529 Current mDNS implementation closes and re-opens all of the network interfaces when any of the existing interfaces changes. Since UWB on start/stop ranging modifies its interface, mDNS detects that as a significant enough change to restart all of its interfaces. This change prevents that behaviour since the UWB interface is not related to anything what mDNS does. If the detected interface change is neither an IPv4 or IPv6 capable interface and if the interface type is ARPHRD_IEEE802154 which is the IEEE 802.15.4 PHY and MAC standard that UWB uses, then mDNS will ignore it. Bug:265207453 Test: Verified manually after this fix is applied interfaces no longer restart on UWB start/stop ranging. Change-Id: I1c070d989769752fda92bbe9308ca5bfc7c2d3e5 Merged-In: I1c070d989769752fda92bbe9308ca5bfc7c2d3e5
2023-03-07[automerger skipped] Avoid undefined behavior with high interface index am: ↵Remi NGUYEN VAN
21d030fe43 -s ours am: addd640d82 -s ours am: 29975fdd96 -s ours am: 2f13e25a03 -s ours am skip reason: Merged-In I41fae1900400779cecb715e8cfb1e662b88fd41d with SHA-1 e5434e1b07 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/mdnsresponder/+/21735193 Change-Id: I66f41cccc5c857eaa4315edfbba995c565838051 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-07[automerger skipped] Avoid undefined behavior with high interface index am: ↵Remi NGUYEN VAN
21d030fe43 -s ours am: addd640d82 -s ours am: 29975fdd96 -s ours am: 53c4a66233 -s ours am skip reason: Merged-In I41fae1900400779cecb715e8cfb1e662b88fd41d with SHA-1 e5434e1b07 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/mdnsresponder/+/21735193 Change-Id: I3eeff4d462139c013487ab8601575de16376fb67 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-07[automerger skipped] Avoid undefined behavior with high interface index am: ↵Remi NGUYEN VAN
21d030fe43 -s ours am: addd640d82 -s ours am: 29975fdd96 -s ours am skip reason: Merged-In I41fae1900400779cecb715e8cfb1e662b88fd41d with SHA-1 e5434e1b07 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/mdnsresponder/+/21735193 Change-Id: I89f88ca6c25b1553a49d9b17bd838a405827b640 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-07[automerger skipped] Avoid undefined behavior with high interface index am: ↵Remi NGUYEN VAN
21d030fe43 -s ours am: addd640d82 -s ours am: 29975fdd96 -s ours am skip reason: Merged-In I41fae1900400779cecb715e8cfb1e662b88fd41d with SHA-1 e5434e1b07 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/mdnsresponder/+/21735193 Change-Id: I64c214473488e5da24b026a6d1816d87659e8aa7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-06[automerger skipped] Avoid undefined behavior with high interface index am: ↵Remi NGUYEN VAN
21d030fe43 -s ours am: addd640d82 -s ours am skip reason: Merged-In I41fae1900400779cecb715e8cfb1e662b88fd41d with SHA-1 e5434e1b07 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/mdnsresponder/+/21735193 Change-Id: I4191f7811a2f6e2e315031524998359d93c9b02d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-06[automerger skipped] Avoid undefined behavior with high interface index am: ↵Remi NGUYEN VAN
21d030fe43 -s ours am skip reason: Merged-In I41fae1900400779cecb715e8cfb1e662b88fd41d with SHA-1 e5434e1b07 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/mdnsresponder/+/21735193 Change-Id: I37d76f687ca1a41743596b6352da5e6584566fb9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-04Merge "Fix UWB start/stop ranging causing mDNS drop" am: e1787d392f am: ↵Ante Culo
3b23452722 am: 62c6662cc2 am: 9aa4389656 am: 58d7aa03a7 Original change: https://android-review.googlesource.com/c/platform/external/mdnsresponder/+/2463529 Change-Id: I12811c874f9e7b3ae18f9eecb37b3f687a01ce8e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-03Merge "Fix UWB start/stop ranging causing mDNS drop" am: e1787d392f am: ↵Ante Culo
3b23452722 am: 62c6662cc2 am: 9aa4389656 am: bd41300005 Original change: https://android-review.googlesource.com/c/platform/external/mdnsresponder/+/2463529 Change-Id: Ia2ea25bcd6002725355ce28d3f0b8bf4707f111a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-03Merge "Fix UWB start/stop ranging causing mDNS drop" am: e1787d392f am: ↵Ante Culo
3b23452722 am: 62c6662cc2 am: 9aa4389656 Original change: https://android-review.googlesource.com/c/platform/external/mdnsresponder/+/2463529 Change-Id: I045d699ed8a9c082a7119fe4665a11cec44501af Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-03Merge "Fix UWB start/stop ranging causing mDNS drop" am: e1787d392f am: ↵Ante Culo
3b23452722 am: 62c6662cc2 am: 9aa4389656 Original change: https://android-review.googlesource.com/c/platform/external/mdnsresponder/+/2463529 Change-Id: Id17453fd26b531ac1400022c4a0c0f132ebe96ea Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-03Merge "Fix UWB start/stop ranging causing mDNS drop" am: e1787d392f am: ↵Ante Culo
3b23452722 am: 62c6662cc2 Original change: https://android-review.googlesource.com/c/platform/external/mdnsresponder/+/2463529 Change-Id: Ic9a28bf81c133d1f2bc71b2847ae2b6ed68a6adb Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-03Avoid undefined behavior with high interface indexRemi NGUYEN VAN
Cherry-pick from aosp/2125173 Behavior of bitwise left shift is undefined when the right operator is greater than the number of bits in the left operand; so the code relied on undefined behavior when interface indexes were >= 32. Just use a boolean instead, as the result was only used as a boolean. Also do not limit reads in if_inet6 to 1 byte for address flags, scope value, and prefix length, as there is no good reason to do so, and this is in line with more recent upstream versions and the interface index read. In practice prefix length, scope value and interface flags should not be above 255 so this should be a no-op. Bug: 235797641 Test: atest NsdManagerTest --rerun-until-failure 50 Change-Id: I41fae1900400779cecb715e8cfb1e662b88fd41d Merged-In: I41fae1900400779cecb715e8cfb1e662b88fd41d
2023-03-03Merge "Fix UWB start/stop ranging causing mDNS drop" am: e1787d392f am: ↵Ante Culo
3b23452722 Original change: https://android-review.googlesource.com/c/platform/external/mdnsresponder/+/2463529 Change-Id: Id79aba5d2663b79396b27f5483ec51fe001722a3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-02Merge "Fix UWB start/stop ranging causing mDNS drop" am: e1787d392fandroid-u-beta-1-gplAnte Culo
Original change: https://android-review.googlesource.com/c/platform/external/mdnsresponder/+/2463529 Change-Id: Ic5f52020e9920913eeafb2307b52aeee8a7c3e06 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-02Merge "Fix UWB start/stop ranging causing mDNS drop"Ante Culo
2023-03-01Fix UWB start/stop ranging causing mDNS dropAnte
Current mDNS implementation closes and re-opens all of the network interfaces when any of the existing interfaces changes. Since UWB on start/stop ranging modifies its interface, mDNS detects that as a significant enough change to restart all of its interfaces. This change prevents that behaviour since the UWB interface is not related to anything what mDNS does. If the detected interface change is neither an IPv4 or IPv6 capable interface and if the interface type is ARPHRD_IEEE802154 which is the IEEE 802.15.4 PHY and MAC standard that UWB uses, then mDNS will ignore it. Bug:265207453 Test: Verified manually after this fix is applied interfaces no longer restart on UWB start/stop ranging. Change-Id: I1c070d989769752fda92bbe9308ca5bfc7c2d3e5
2022-07-04[automerger skipped] Merge "Set min_sdk_version" am: 53ed7525b1 am: ↵Treehugger Robot
65aabca6fa -s ours am: 52b2e21388 -s ours am: 30e3b94c99 -s ours am: 4cdbbf938a -s ours am skip reason: Merged-In I50bb1965908beb694a3b417268beb0d8c510b3bd with SHA-1 0a1101c3db is already in history Original change: https://android-review.googlesource.com/c/platform/external/mdnsresponder/+/2139233 Change-Id: I256bcd2fef7f352393bdd9c45fd4bd2711beadec Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-04[automerger skipped] Merge "Set min_sdk_version" am: 53ed7525b1 am: ↵main-16k-with-phonesTreehugger Robot
65aabca6fa -s ours am: 52b2e21388 -s ours am: 30e3b94c99 -s ours am skip reason: Merged-In I50bb1965908beb694a3b417268beb0d8c510b3bd with SHA-1 0a1101c3db is already in history Original change: https://android-review.googlesource.com/c/platform/external/mdnsresponder/+/2139233 Change-Id: I0616f15080745f0af99b10a52a9d642e80b448f1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>