)]}' { "log": [ { "commit": "4cb73998ebbdd673f2cad5a7834edbb19e96ef65", "tree": "9047668b3226c47c406208932dcb7b952edbf0ad", "parents": [ "049e15574ba509244b78f0b7ab9554356dd1940a", "6183394f0789b74812ad90b12eb85f7cef17b41e" ], "author": { "name": "Zhanglong Xia", "email": "zhanglongxia@google.com", "time": "Wed Mar 19 08:18:46 2025 -0700" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Mar 19 08:18:46 2025 -0700" }, "message": "Merge \"[Thread] add country code overlay to enable/disable setting Thread country code\" into main am: adb71602c5 am: 6183394f07\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/3545881\n\nChange-Id: I1823145478473a8daf18f3d5627360898a49b213\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "6183394f0789b74812ad90b12eb85f7cef17b41e", "tree": "cfef98a85d87f3bfd27fcf6c7a4a85a0325b1d2f", "parents": [ "f13ae6e021e5caaaa4fa993b9353afa395772c4f", "adb71602c5d2ddf68267fe90a151929bedd96d8f" ], "author": { "name": "Zhanglong Xia", "email": "zhanglongxia@google.com", "time": "Wed Mar 19 07:54:04 2025 -0700" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Mar 19 07:54:04 2025 -0700" }, "message": "Merge \"[Thread] add country code overlay to enable/disable setting Thread country code\" into main am: adb71602c5\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/3545881\n\nChange-Id: Ieac083244fe1236872d7d88c9a0b1fde6db13c63\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "049e15574ba509244b78f0b7ab9554356dd1940a", "tree": "10d3b59aca5cf779ad4a2d7297f90acd39120072", "parents": [ "71cee5fc9e4f5ccaa626f10addcce1c604d157c8", "f13ae6e021e5caaaa4fa993b9353afa395772c4f" ], "author": { "name": "Quang Luong", "email": "qal@google.com", "time": "Wed Mar 19 07:42:05 2025 -0700" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Mar 19 07:42:05 2025 -0700" }, "message": "Merge \"Add DO app bypass for start/stopTethering\" into main am: 038fd312fe am: f13ae6e021\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/3395339\n\nChange-Id: I608ceee99b9b72c781671a67a322dd5a4ef4bfa5\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "adb71602c5d2ddf68267fe90a151929bedd96d8f", "tree": "cfef98a85d87f3bfd27fcf6c7a4a85a0325b1d2f", "parents": [ "038fd312fe004eecf590e4a50c3beed7d575dc69", "73561713397732fc07a48930f0da757b4fbc67c4" ], "author": { "name": "Zhanglong Xia", "email": "zhanglongxia@google.com", "time": "Wed Mar 19 07:27:48 2025 -0700" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Wed Mar 19 07:27:48 2025 -0700" }, "message": "Merge \"[Thread] add country code overlay to enable/disable setting Thread country code\" into main" }, { "commit": "f13ae6e021e5caaaa4fa993b9353afa395772c4f", "tree": "2d98898dad1c8c8d359a4012b371ca439274db7f", "parents": [ "6ef793e0f15e9de42a408564d60bb8792f99e6fa", "038fd312fe004eecf590e4a50c3beed7d575dc69" ], "author": { "name": "Quang Luong", "email": "qal@google.com", "time": "Wed Mar 19 07:19:15 2025 -0700" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Mar 19 07:19:15 2025 -0700" }, "message": "Merge \"Add DO app bypass for start/stopTethering\" into main am: 038fd312fe\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/3395339\n\nChange-Id: I5f0841751e2f3bdbc6dd6a110e01d68eeaec9fc8\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "038fd312fe004eecf590e4a50c3beed7d575dc69", "tree": "2d98898dad1c8c8d359a4012b371ca439274db7f", "parents": [ "b9314970da9ea7f318657590e0273bd9e3e835fd", "3f22173b75502bdb4dbbc9477a6beb890a97388b" ], "author": { "name": "Quang Luong", "email": "qal@google.com", "time": "Wed Mar 19 06:51:22 2025 -0700" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Wed Mar 19 06:51:22 2025 -0700" }, "message": "Merge \"Add DO app bypass for start/stopTethering\" into main" }, { "commit": "71cee5fc9e4f5ccaa626f10addcce1c604d157c8", "tree": "9246a487f135491277ea0d02c05e851f23f749ca", "parents": [ "01b35cd8190c56e9d019e1ca33a3364e30cd9e76", "6ef793e0f15e9de42a408564d60bb8792f99e6fa" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Wed Mar 19 05:37:20 2025 -0700" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Mar 19 05:37:20 2025 -0700" }, "message": "Merge \"BpfNetMaps: auto populate interface tracker\" into main am: b9314970da am: 6ef793e0f1\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/3549344\n\nChange-Id: I81be2aea85a85856e6c20a33c7640f6455bd45d6\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "01b35cd8190c56e9d019e1ca33a3364e30cd9e76", "tree": "ec9d570889aa4aa90e3e16b8e6db35ba9c0f2a4c", "parents": [ "51cc3f1ae49c049472e20393b08ff60cad2e19ee", "7692101949548b3fbc760490edca8ef69b9c72b4" ], "author": { "name": "Quang Luong", "email": "qal@google.com", "time": "Wed Mar 19 05:36:59 2025 -0700" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Mar 19 05:36:59 2025 -0700" }, "message": "Merge \"Skip hostside tethering test if not SdkLevel.isAtLeastB()\" into main am: b0cad64f5f am: 7692101949\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/3551079\n\nChange-Id: Idb257aa942342f6b8f1f7681382b23ce80778624\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "6ef793e0f15e9de42a408564d60bb8792f99e6fa", "tree": "a4f8a92a5add91eb6173b385f89f0e0838f144cc", "parents": [ "7692101949548b3fbc760490edca8ef69b9c72b4", "b9314970da9ea7f318657590e0273bd9e3e835fd" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Wed Mar 19 04:51:37 2025 -0700" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Mar 19 04:51:37 2025 -0700" }, "message": "Merge \"BpfNetMaps: auto populate interface tracker\" into main am: b9314970da\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/3549344\n\nChange-Id: I5a11dee634a6129fbf7710bf0b66a7b363950a8f\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "7692101949548b3fbc760490edca8ef69b9c72b4", "tree": "9407e9305312c7a6a327f6bf7eda9b23be206956", "parents": [ "373236eb76294bfaebf3b60b504918f5e78e46d2", "b0cad64f5fd02184c00220595bfc5307855f190d" ], "author": { "name": "Quang Luong", "email": "qal@google.com", "time": "Wed Mar 19 04:50:51 2025 -0700" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Mar 19 04:50:51 2025 -0700" }, "message": "Merge \"Skip hostside tethering test if not SdkLevel.isAtLeastB()\" into main am: b0cad64f5f\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/3551079\n\nChange-Id: I66da6d15072e5486fa1b65663c892b5bd4dbaaa4\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "b9314970da9ea7f318657590e0273bd9e3e835fd", "tree": "a4f8a92a5add91eb6173b385f89f0e0838f144cc", "parents": [ "b0cad64f5fd02184c00220595bfc5307855f190d", "cdac5e3d46d6f133ef0d55006b72278c7eda88e8" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Wed Mar 19 04:44:30 2025 -0700" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Wed Mar 19 04:44:30 2025 -0700" }, "message": "Merge \"BpfNetMaps: auto populate interface tracker\" into main" }, { "commit": "b0cad64f5fd02184c00220595bfc5307855f190d", "tree": "9407e9305312c7a6a327f6bf7eda9b23be206956", "parents": [ "0613620f404ce34afd39b12b53a962f3d71d2935", "cd2b87e4c929ee3fb37798ed71f9c077335a2124" ], "author": { "name": "Quang Luong", "email": "qal@google.com", "time": "Wed Mar 19 04:24:46 2025 -0700" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Wed Mar 19 04:24:46 2025 -0700" }, "message": "Merge \"Skip hostside tethering test if not SdkLevel.isAtLeastB()\" into main" }, { "commit": "51cc3f1ae49c049472e20393b08ff60cad2e19ee", "tree": "b9c147908214267ec19dad9cfa7978146e53d96a", "parents": [ "b0c4c2f23e3dd1721e214fb50accff366da955e0", "373236eb76294bfaebf3b60b504918f5e78e46d2" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Wed Mar 19 03:41:48 2025 -0700" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Mar 19 03:41:48 2025 -0700" }, "message": "Merge \"Shorten \u0027dumpsys connectivity trafficcontroller\u0027 for sLocalNetAccessMap and sLocalNetBlockedUidMap\" into main am: 0613620f40 am: 373236eb76\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/3550247\n\nChange-Id: Id3c26160d9a2de279f465a7c468f7b6952ff9f51\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "3f22173b75502bdb4dbbc9477a6beb890a97388b", "tree": "46593dcaf057cf8edd11da7e4053d06035e5ae6a", "parents": [ "0613620f404ce34afd39b12b53a962f3d71d2935" ], "author": { "name": "Quang Anh Luong", "email": "qal@google.com", "time": "Thu Dec 05 15:46:06 2024 +0900" }, "committer": { "name": "Quang Luong", "email": "qal@google.com", "time": "Wed Mar 19 03:30:48 2025 -0700" }, "message": "Add DO app bypass for start/stopTethering\n\nAllow DO apps to call startTethering and stopTethering for wifi\ntethering with a non-null SoftApConfiguration.\n\nBug: 295979433\nTest: atest TetheringTests CtsTetheringTests\n\nChange-Id: Ie5836e9e30afb2df1de0640645d696e185aa2191\n" }, { "commit": "cd2b87e4c929ee3fb37798ed71f9c077335a2124", "tree": "23691e36ef4ada3b1dfff6afcff423895e846266", "parents": [ "e149a49c7dfbeb8f94b746321f6ea01bcb66a859" ], "author": { "name": "Quang Anh Luong", "email": "qal@google.com", "time": "Wed Mar 19 12:46:45 2025 +0900" }, "committer": { "name": "Quang Anh Luong", "email": "qal@google.com", "time": "Wed Mar 19 19:26:24 2025 +0900" }, "message": "Skip hostside tethering test if not SdkLevel.isAtLeastB()\n\nHostsideTetheringTest#testSoftApConfigurationRedactedForOtherApps is\nonly applicable in B+, so skip it if not.\n\nBug: 403129363\nTest: atest HostsideTetheringTests\nChange-Id: I6b4be858befcabb1892ee4113ac2cf17b5d49ca5\n" }, { "commit": "373236eb76294bfaebf3b60b504918f5e78e46d2", "tree": "7faa7b002c2458d63084012ea2022d29924b1149", "parents": [ "9d2640b82c4dc014fdfd2f41f574891ab1a04cb9", "0613620f404ce34afd39b12b53a962f3d71d2935" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Wed Mar 19 03:18:18 2025 -0700" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Mar 19 03:18:18 2025 -0700" }, "message": "Merge \"Shorten \u0027dumpsys connectivity trafficcontroller\u0027 for sLocalNetAccessMap and sLocalNetBlockedUidMap\" into main am: 0613620f40\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/3550247\n\nChange-Id: I7db1ef6b0a58d1efbe66e300b83fb7d9a6f91793\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "cdac5e3d46d6f133ef0d55006b72278c7eda88e8", "tree": "ff45a57894007410d989fd3dbb4ff28de210cfe3", "parents": [ "0613620f404ce34afd39b12b53a962f3d71d2935" ], "author": { "name": "Maciej Żenczykowski", "email": "maze@google.com", "time": "Tue Mar 18 18:51:19 2025 -0700" }, "committer": { "name": "Maciej Żenczykowski", "email": "maze@google.com", "time": "Wed Mar 19 02:55:42 2025 -0700" }, "message": "BpfNetMaps: auto populate interface tracker\n\non demand, should get rid of:\n\n$ adb shell logcat -s -d : | egrep -i bpfn\n03-18 11:55:20.724 826 2453 E BpfNetMaps: Failed to get if index, skip addLocalNetAccess for /224.0.0.0(buried_eth0)\n03-18 11:55:20.724 826 2453 E BpfNetMaps: Failed to get if index, skip addLocalNetAccess for /ff00::(buried_eth0)\n03-18 11:55:20.724 826 2453 E BpfNetMaps: Failed to get if index, skip addLocalNetAccess for /255.255.255.255(buried_eth0)\n03-18 11:55:20.724 826 2453 E BpfNetMaps: Failed to get if index, skip addLocalNetAccess for /192.168.0.0(buried_eth0)\n03-18 11:55:26.328 826 2453 E BpfNetMaps: Failed to get if index, skip addLocalNetAccess for /224.0.0.0(wlan0)\n03-18 11:55:26.328 826 2453 E BpfNetMaps: Failed to get if index, skip addLocalNetAccess for /ff00::(wlan0)\n03-18 11:55:26.328 826 2453 E BpfNetMaps: Failed to get if index, skip addLocalNetAccess for /255.255.255.255(wlan0)\n03-18 11:55:26.328 826 2453 E BpfNetMaps: Failed to get if index, skip addLocalNetAccess for /fe80::(wlan0)\n03-18 11:55:29.333 826 2453 E BpfNetMaps: Failed to get if index, skip addLocalNetAccess for /fe80::(wlan0)\n03-18 11:55:29.348 826 2453 E BpfNetMaps: Failed to get if index, skip addLocalNetAccess for /fe80::(wlan0)\n03-18 11:55:29.349 826 2453 E BpfNetMaps: Failed to get if index, skip addLocalNetAccess for /192.168.99.1(wlan0)\n03-18 11:55:29.349 826 2453 E BpfNetMaps: Failed to get if index, skip addLocalNetAccess for /192.168.99.1(wlan0)\n03-18 11:55:29.349 826 2453 E BpfNetMaps: Failed to get if index, skip addLocalNetAccess for /192.168.0.0(wlan0)\n\nTest: TreeHugger\nSigned-off-by: Maciej Żenczykowski \u003cmaze@google.com\u003e\nChange-Id: I1a8c0fcef43674677fd267534d0cc9d1f8514792\n" }, { "commit": "0613620f404ce34afd39b12b53a962f3d71d2935", "tree": "7faa7b002c2458d63084012ea2022d29924b1149", "parents": [ "102efd2f60287f0df40c0fe502a38711288fe193", "9456c35580503eb74c7643d98b2dbf919845dd13" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Wed Mar 19 02:53:19 2025 -0700" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Wed Mar 19 02:53:19 2025 -0700" }, "message": "Merge \"Shorten \u0027dumpsys connectivity trafficcontroller\u0027 for sLocalNetAccessMap and sLocalNetBlockedUidMap\" into main" }, { "commit": "b0c4c2f23e3dd1721e214fb50accff366da955e0", "tree": "373d3dcea5a694611f7431aaef214cc440c75113", "parents": [ "a6aaec07b69e9cf4e09d431c64e37490b957a1e2", "9d2640b82c4dc014fdfd2f41f574891ab1a04cb9" ], "author": { "name": "Maciej Żenczykowski", "email": "maze@google.com", "time": "Wed Mar 19 01:38:23 2025 -0700" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Mar 19 01:38:23 2025 -0700" }, "message": "Merge \"NetBpfLoad: merge two map creation ALOGs\" into main am: 102efd2f60 am: 9d2640b82c\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/3551039\n\nChange-Id: Id5976543cbbe9c7148bc0abb158d5f33961d51f7\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "9d2640b82c4dc014fdfd2f41f574891ab1a04cb9", "tree": "0e2d95429f8730a7c560102fbb91350079b5db85", "parents": [ "1add6e8830a205c8b360068aec2965989f67edc1", "102efd2f60287f0df40c0fe502a38711288fe193" ], "author": { "name": "Maciej Żenczykowski", "email": "maze@google.com", "time": "Wed Mar 19 01:14:53 2025 -0700" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Mar 19 01:14:53 2025 -0700" }, "message": "Merge \"NetBpfLoad: merge two map creation ALOGs\" into main am: 102efd2f60\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/3551039\n\nChange-Id: I3c77774e31789cdbc15967d94e50403d982013ed\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "a6aaec07b69e9cf4e09d431c64e37490b957a1e2", "tree": "81e34cb2e78f40ab3724d05029ed33e22491a0b2", "parents": [ "42c06f3046d723e28357a1bbd4d395204457cdf9", "1add6e8830a205c8b360068aec2965989f67edc1" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Wed Mar 19 00:41:39 2025 -0700" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Mar 19 00:41:39 2025 -0700" }, "message": "Merge \"clatd: implement seccomp system call protection\" into main am: 981d25017f am: 1add6e8830\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/3548763\n\nChange-Id: Ib88b004911d5c98ce6a81420a0c5ccb996c55065\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "42c06f3046d723e28357a1bbd4d395204457cdf9", "tree": "55a5280c36fd84335fc37e6a7aee77c1c5185f82", "parents": [ "7945fbd90a4dcf8a3f0907cadc5f9662062354b5", "553e1884d4ff3ee4725aaadb985388ca12ad2471" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Wed Mar 19 00:41:07 2025 -0700" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Mar 19 00:41:07 2025 -0700" }, "message": "Merge \"Force TETHER_ENABLE_SYNC_SM to be enabled by default on 25Q2+\" into main am: 811db343cd am: 553e1884d4\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/3541181\n\nChange-Id: I622c3177e0e985b84f5660a3b4d76230bfc2b487\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "102efd2f60287f0df40c0fe502a38711288fe193", "tree": "0e2d95429f8730a7c560102fbb91350079b5db85", "parents": [ "981d25017fefa41704f45328bf725bebdf8b5d2a", "9fef930ff1e740256c76e319b3f98bcfa7c9e8f2" ], "author": { "name": "Maciej Żenczykowski", "email": "maze@google.com", "time": "Wed Mar 19 00:27:35 2025 -0700" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Wed Mar 19 00:27:35 2025 -0700" }, "message": "Merge \"NetBpfLoad: merge two map creation ALOGs\" into main" }, { "commit": "1add6e8830a205c8b360068aec2965989f67edc1", "tree": "2ada4b9ff7625316fe1357a1ee20205ebceafaf9", "parents": [ "553e1884d4ff3ee4725aaadb985388ca12ad2471", "981d25017fefa41704f45328bf725bebdf8b5d2a" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Wed Mar 19 00:17:44 2025 -0700" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Mar 19 00:17:44 2025 -0700" }, "message": "Merge \"clatd: implement seccomp system call protection\" into main am: 981d25017f\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/3548763\n\nChange-Id: I0dcd8536d9bd01ae3bc82d0d9ea662e26dd76841\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "553e1884d4ff3ee4725aaadb985388ca12ad2471", "tree": "bde2f80d6f3f3f187e011d5783b11eed4dc0bd7b", "parents": [ "b3245ea97d69079b9acf3c5ba3eaf8e750246746", "811db343cd61d2d8548d5479d9c7b7b8e10d716d" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Wed Mar 19 00:17:14 2025 -0700" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Mar 19 00:17:14 2025 -0700" }, "message": "Merge \"Force TETHER_ENABLE_SYNC_SM to be enabled by default on 25Q2+\" into main am: 811db343cd\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/3541181\n\nChange-Id: I405e408729e822ca181251e4e37b16ad638df411\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "981d25017fefa41704f45328bf725bebdf8b5d2a", "tree": "2ada4b9ff7625316fe1357a1ee20205ebceafaf9", "parents": [ "811db343cd61d2d8548d5479d9c7b7b8e10d716d", "5ae193ae36ec7621a5f7bcf387997c5081e9c239" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Wed Mar 19 00:01:27 2025 -0700" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Wed Mar 19 00:01:27 2025 -0700" }, "message": "Merge \"clatd: implement seccomp system call protection\" into main" }, { "commit": "811db343cd61d2d8548d5479d9c7b7b8e10d716d", "tree": "bde2f80d6f3f3f187e011d5783b11eed4dc0bd7b", "parents": [ "8b7891106cc731dc9c9458c856f993b963236174", "133d80662794b80269476dbdd75a580fb16c7382" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Tue Mar 18 23:56:52 2025 -0700" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Tue Mar 18 23:56:52 2025 -0700" }, "message": "Merge \"Force TETHER_ENABLE_SYNC_SM to be enabled by default on 25Q2+\" into main" }, { "commit": "7945fbd90a4dcf8a3f0907cadc5f9662062354b5", "tree": "1e29078977c751ac331fc345f0d3249ceaadeb37", "parents": [ "2c46ff66477ad0b87fc802669b7f21502410e0b0", "b3245ea97d69079b9acf3c5ba3eaf8e750246746" ], "author": { "name": "Junyu Lai", "email": "junyulai@google.com", "time": "Tue Mar 18 23:09:15 2025 -0700" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Mar 18 23:09:15 2025 -0700" }, "message": "Merge \"Fix kotlin lint errors\" into main am: 8b7891106c am: b3245ea97d\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/3550879\n\nChange-Id: If49b299fa7f3001cfb2d7d43f8db41a431e60e92\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "9fef930ff1e740256c76e319b3f98bcfa7c9e8f2", "tree": "9696540f33623f5fd32b1934f2ee4c3a66583180", "parents": [ "5eb96faaf63dc953cd2192db5706eafd013311d1" ], "author": { "name": "Maciej Żenczykowski", "email": "maze@google.com", "time": "Tue Mar 18 20:09:34 2025 -0700" }, "committer": { "name": "Maciej Żenczykowski", "email": "maze@google.com", "time": "Tue Mar 18 23:01:20 2025 -0700" }, "message": "NetBpfLoad: merge two map creation ALOGs\n\nOne ALOG to record whether the map is created by btf or not.\n\nTest: TreeHugger\nSigned-off-by: Maciej Żenczykowski \u003cmaze@google.com\u003e\nChange-Id: I5da3af67ba28b01ee4e7b08e61f1fedc24e2840f\n" }, { "commit": "b3245ea97d69079b9acf3c5ba3eaf8e750246746", "tree": "35b29c993ae7b52ec3a7f6ebcb3e864b14ebde85", "parents": [ "c1bab2616695b836cb26ad5bdf581256a7254594", "8b7891106cc731dc9c9458c856f993b963236174" ], "author": { "name": "Junyu Lai", "email": "junyulai@google.com", "time": "Tue Mar 18 22:47:01 2025 -0700" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Mar 18 22:47:01 2025 -0700" }, "message": "Merge \"Fix kotlin lint errors\" into main am: 8b7891106c\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/3550879\n\nChange-Id: Ib620c3add3e76672006cd6983b93c99ea99cdbc8\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "8b7891106cc731dc9c9458c856f993b963236174", "tree": "35b29c993ae7b52ec3a7f6ebcb3e864b14ebde85", "parents": [ "5eb96faaf63dc953cd2192db5706eafd013311d1", "c3717cf50292a00d6916d2d89a526fb30c005ad1" ], "author": { "name": "Junyu Lai", "email": "junyulai@google.com", "time": "Tue Mar 18 22:26:03 2025 -0700" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Tue Mar 18 22:26:03 2025 -0700" }, "message": "Merge \"Fix kotlin lint errors\" into main" }, { "commit": "73561713397732fc07a48930f0da757b4fbc67c4", "tree": "7a1b92e7f587a920b5e5bbfed2cbee7894bbb827", "parents": [ "996c612875faf8d3b64e405e3c2c98292b7b5637" ], "author": { "name": "Zhanglong Xia", "email": "zhanglongxia@google.com", "time": "Mon Mar 17 10:51:24 2025 +0800" }, "committer": { "name": "Zhanglong Xia", "email": "zhanglongxia@google.com", "time": "Wed Mar 19 05:23:13 2025 +0000" }, "message": "[Thread] add country code overlay to enable/disable setting Thread country code\n\nSome android devices call the API `setChannelMaxPowers()` to set the\nThread radio output power. Then there is no need for these devices\nto set the Thread country code.\n\nThis commit adds an overlay configuration `config_thread_country_code_enabled`\nto enable/disable setting the Thread country code.\n\nBug: b/402276117\nTest: atest ThreadNetworkUnitTests:ThreadNetworkCountryCodeTest#initialize_countryCodeDisabled_defaultCountryCodeIsUsed\nChange-Id: I215c64757d0277853f8d4625ace363a4d7bb974b\n" }, { "commit": "9456c35580503eb74c7643d98b2dbf919845dd13", "tree": "2d8c315e6305f1937cb89720e9da6f079536e06f", "parents": [ "5eb96faaf63dc953cd2192db5706eafd013311d1" ], "author": { "name": "Maciej Żenczykowski", "email": "maze@google.com", "time": "Tue Mar 18 19:54:56 2025 -0700" }, "committer": { "name": "Maciej Żenczykowski", "email": "maze@google.com", "time": "Tue Mar 18 19:56:19 2025 -0700" }, "message": "Shorten \u0027dumpsys connectivity trafficcontroller\u0027 for sLocalNetAccessMap and sLocalNetBlockedUidMap\n\nBefore:\n sLocalNetAccessMap:\n [LocalNetAccessKey{lpmBitlen\u003d132, ifIndex\u003d47, remoteAddress\u003d/::ffff:224.0.0.0, protocol\u003d0, remotePort\u003d0}]: val: false\n\nAfter:\n sLocalNetAccessMap:\n LocalNetAccessKey{lpmBitlen\u003d132, ifIndex\u003d47, remoteAddress\u003d/::ffff:224.0.0.0, protocol\u003d0, remotePort\u003d0}: false\n\nTest: TreeHugger\nSigned-off-by: Maciej Żenczykowski \u003cmaze@google.com\u003e\nChange-Id: I4e12722660cd68319239da8edbd0293bbb7684e5\n" }, { "commit": "c3717cf50292a00d6916d2d89a526fb30c005ad1", "tree": "56c0035cac7623713721d09a364d2bb5649364b9", "parents": [ "e149a49c7dfbeb8f94b746321f6ea01bcb66a859" ], "author": { "name": "Junyu Lai", "email": "junyulai@google.com", "time": "Wed Mar 19 07:40:15 2025 +0800" }, "committer": { "name": "Junyu Lai", "email": "junyulai@google.com", "time": "Wed Mar 19 10:52:36 2025 +0800" }, "message": "Fix kotlin lint errors\n\nThis change is a no-op which only fix lint errors.\nThis is necessary to make the subsequent changes easier to review.\n\nTest: TH\nBug: 349487600\nChange-Id: Ief867009db6aaabd9d0759048cdd7c3318991b02\n" }, { "commit": "2c46ff66477ad0b87fc802669b7f21502410e0b0", "tree": "b27a1d414247b1b19ede4737ce6f30d7a6255956", "parents": [ "83c086cec80c37d9eb47550cfc1d7746adfcb38d", "c1bab2616695b836cb26ad5bdf581256a7254594" ], "author": { "name": "Jean Chalard", "email": "jchalard@google.com", "time": "Tue Mar 18 18:54:50 2025 -0700" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Mar 18 18:54:50 2025 -0700" }, "message": "Merge changes Idf75e4e9,Idf0435f4 into main am: 5eb96faaf6 am: c1bab26166\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/3547401\n\nChange-Id: I01eb3ba454c4fd250c8cfcb8d4a6e9d2f50e3e49\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "c1bab2616695b836cb26ad5bdf581256a7254594", "tree": "e9f431b1934bd4c475580511eea877a07303f0f1", "parents": [ "a3fdd7cc61111b0c45ac4db711437f854abfbc0e", "5eb96faaf63dc953cd2192db5706eafd013311d1" ], "author": { "name": "Jean Chalard", "email": "jchalard@google.com", "time": "Tue Mar 18 18:31:04 2025 -0700" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Mar 18 18:31:04 2025 -0700" }, "message": "Merge changes Idf75e4e9,Idf0435f4 into main am: 5eb96faaf6\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/3547401\n\nChange-Id: Ia0f4d95066a561e5350d4d017910e55855b0dd6f\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "5eb96faaf63dc953cd2192db5706eafd013311d1", "tree": "e9f431b1934bd4c475580511eea877a07303f0f1", "parents": [ "f365ac85530c5e38bcf61a4987457ecfc5fc9714", "c2cf5ea823d94f19d523414d0349e9b0c0dc6e1b" ], "author": { "name": "Jean Chalard", "email": "jchalard@google.com", "time": "Tue Mar 18 18:07:59 2025 -0700" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Tue Mar 18 18:07:59 2025 -0700" }, "message": "Merge changes Idf75e4e9,Idf0435f4 into main\n\n* changes:\n Process enqueued messages from the NAI synchronously.\n Remove the queue on the NetworkAgent side\n" }, { "commit": "83c086cec80c37d9eb47550cfc1d7746adfcb38d", "tree": "46a4c43fd4352528c1a22c412d25cd898bf80e38", "parents": [ "c57fab0820d9c12e7e1ef9e7688eb7d479578309", "a3fdd7cc61111b0c45ac4db711437f854abfbc0e" ], "author": { "name": "Maciej Żenczykowski", "email": "maze@google.com", "time": "Tue Mar 18 17:25:34 2025 -0700" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Mar 18 17:25:34 2025 -0700" }, "message": "Merge changes from topic \"enable_btf\" into main am: f365ac8553 am: a3fdd7cc61\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/3547727\n\nChange-Id: Ie9f259179ef5f5bd15be9f9cbf0863ff7e07ed69\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "c57fab0820d9c12e7e1ef9e7688eb7d479578309", "tree": "7781ccdde4687fe8cf9e51fabed2e4fc8a3c2bdd", "parents": [ "05ba4d9929e8454befdd020d3702569c22c2416c", "f7356c3c10bebe0538784495bb5e8c3493391032" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Tue Mar 18 17:25:23 2025 -0700" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Mar 18 17:25:23 2025 -0700" }, "message": "Merge \"Enable libbpf logging in bpf loader\" into main am: 0c2cb82014 am: f7356c3c10\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/3547722\n\nChange-Id: I2edc96343d7b2330497ab0889d298c301851d938\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "05ba4d9929e8454befdd020d3702569c22c2416c", "tree": "1c8a909c32caa371cd8551572b82b388ae4d1553", "parents": [ "811cc3e1e1a17b573eb67bad817d7c3448a2f799", "20761577a98bc11d6a0f5f78ac353efdbce6d508" ], "author": { "name": "Maciej Żenczykowski", "email": "maze@google.com", "time": "Tue Mar 18 17:25:10 2025 -0700" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Mar 18 17:25:10 2025 -0700" }, "message": "Merge \"Add Ping6 offload for APFv6 multi-devices tests\" into main am: ef10edc183 am: 20761577a9\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/3539241\n\nChange-Id: I2d399aed0c0be9f0e5cf52c3c1a9ccb382f53c28\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "a3fdd7cc61111b0c45ac4db711437f854abfbc0e", "tree": "e2e5c18870c360c3df3bdc355497c0166846b505", "parents": [ "f7356c3c10bebe0538784495bb5e8c3493391032", "f365ac85530c5e38bcf61a4987457ecfc5fc9714" ], "author": { "name": "Maciej Żenczykowski", "email": "maze@google.com", "time": "Tue Mar 18 17:14:22 2025 -0700" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Mar 18 17:14:22 2025 -0700" }, "message": "Merge changes from topic \"enable_btf\" into main am: f365ac8553\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/3547727\n\nChange-Id: Ie942c4a8bae89e247446695f7f8db329bcd88b42\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "f365ac85530c5e38bcf61a4987457ecfc5fc9714", "tree": "e2e5c18870c360c3df3bdc355497c0166846b505", "parents": [ "0c2cb82014b23572a8d61eb3cc5e65519b0d863b", "1a5cc5b57c83d56ca0f419bdb5cf39dd1eeac615" ], "author": { "name": "Maciej Żenczykowski", "email": "maze@google.com", "time": "Tue Mar 18 17:04:56 2025 -0700" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Tue Mar 18 17:04:56 2025 -0700" }, "message": "Merge changes from topic \"enable_btf\" into main\n\n* changes:\n Enable BTF for maps loaded by NetBpfLoad\n Add method to get key value type ids\n Add method to load btf into kernel\n Add method to update btf_var_secinfo.offset\n Add method to update btf_type.size for BTF_KIND_DATASEC\n" }, { "commit": "f7356c3c10bebe0538784495bb5e8c3493391032", "tree": "8efcb2a456d86c98814660727fdce6ec814caaf7", "parents": [ "20761577a98bc11d6a0f5f78ac353efdbce6d508", "0c2cb82014b23572a8d61eb3cc5e65519b0d863b" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Tue Mar 18 17:03:15 2025 -0700" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Mar 18 17:03:15 2025 -0700" }, "message": "Merge \"Enable libbpf logging in bpf loader\" into main am: 0c2cb82014\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/3547722\n\nChange-Id: Icce431227fa987717c45218d13a6606dadeeaf96\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "20761577a98bc11d6a0f5f78ac353efdbce6d508", "tree": "9ad03e970b0bcb6338eb6d5a9bd10a3acf780f6a", "parents": [ "6c769d151a4f2cbc79896a5b16290317dd6b575f", "ef10edc183dcf8e06deae800f4417436ce2a0d81" ], "author": { "name": "Maciej Żenczykowski", "email": "maze@google.com", "time": "Tue Mar 18 17:02:59 2025 -0700" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Mar 18 17:02:59 2025 -0700" }, "message": "Merge \"Add Ping6 offload for APFv6 multi-devices tests\" into main am: ef10edc183\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/3539241\n\nChange-Id: I2fae096eece7f7d26b884b3c2b2c7d07ebe496d3\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "0c2cb82014b23572a8d61eb3cc5e65519b0d863b", "tree": "8efcb2a456d86c98814660727fdce6ec814caaf7", "parents": [ "ef10edc183dcf8e06deae800f4417436ce2a0d81", "712088dff3dbb30f8f8b85e3d9547bf41bf1e1f3" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Tue Mar 18 16:46:22 2025 -0700" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Tue Mar 18 16:46:22 2025 -0700" }, "message": "Merge \"Enable libbpf logging in bpf loader\" into main" }, { "commit": "ef10edc183dcf8e06deae800f4417436ce2a0d81", "tree": "9ad03e970b0bcb6338eb6d5a9bd10a3acf780f6a", "parents": [ "e149a49c7dfbeb8f94b746321f6ea01bcb66a859", "c992100a71dfd7e2d5b91df4ef3b66ef41259790" ], "author": { "name": "Maciej Żenczykowski", "email": "maze@google.com", "time": "Tue Mar 18 16:28:38 2025 -0700" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Tue Mar 18 16:28:38 2025 -0700" }, "message": "Merge \"Add Ping6 offload for APFv6 multi-devices tests\" into main" }, { "commit": "811cc3e1e1a17b573eb67bad817d7c3448a2f799", "tree": "74bc5c880eb0d00699ed6abf001688c4d404791d", "parents": [ "cbc5b0e393769925bdc3f36d999ca459b31a7143", "d630928fab554cd8bf39be1b4818236e5ddcd1ec" ], "author": { "name": "Adrian Roos", "email": "roosa@google.com", "time": "Tue Mar 18 15:23:04 2025 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Mar 18 15:23:04 2025 -0700" }, "message": "Merge \"Connectivity: remove usages of deprecated Mockito matchers\" into main" }, { "commit": "1a5cc5b57c83d56ca0f419bdb5cf39dd1eeac615", "tree": "8c7fe0c8c567783008c5d78b2d7a1f8f52b50486", "parents": [ "59b2099360b41e0e1f0a1331d7b9e59452f0f4bf" ], "author": { "name": "Motomu Utsumi", "email": "motomuman@google.com", "time": "Tue Mar 18 15:25:13 2025 +0900" }, "committer": { "name": "Maciej Żenczykowski", "email": "maze@google.com", "time": "Tue Mar 18 12:15:39 2025 -0700" }, "message": "Enable BTF for maps loaded by NetBpfLoad\n\nBug: 403381101\nTest: boot\nChange-Id: I05194e5a2678de07e3542aa744d2350a6d604ea2\n" }, { "commit": "59b2099360b41e0e1f0a1331d7b9e59452f0f4bf", "tree": "1e648667f051fb47531731c34145a637f533e318", "parents": [ "21536e55fc8f4e0f99989c1f83ca33c72abf3edb" ], "author": { "name": "Motomu Utsumi", "email": "motomuman@google.com", "time": "Tue Mar 18 15:10:19 2025 +0900" }, "committer": { "name": "Maciej Żenczykowski", "email": "maze@google.com", "time": "Tue Mar 18 12:15:39 2025 -0700" }, "message": "Add method to get key value type ids\n\nBPF_ANNOTATE_KV_PAIR is used to tell the bpf loader about the btf\nkey_type and value_type of a bpf map.\nThis CL adds a method to get key value type ids from\nBPF_ANNOTATE_KV_PAIR\n\nBug: 403381101\nTest: boot\nChange-Id: If308d49b64b38f65991a0a8177e5072d54e2cdf6\n" }, { "commit": "21536e55fc8f4e0f99989c1f83ca33c72abf3edb", "tree": "b3f01d962df39b325cc82248030b2519cc5fb8ea", "parents": [ "efe33319f7129cf33b6036377feeb8c051c271ee" ], "author": { "name": "Motomu Utsumi", "email": "motomuman@google.com", "time": "Tue Mar 18 15:09:27 2025 +0900" }, "committer": { "name": "Maciej Żenczykowski", "email": "maze@google.com", "time": "Tue Mar 18 12:15:39 2025 -0700" }, "message": "Add method to load btf into kernel\n\nBug: 403381101\nTest: boot\nChange-Id: I9d5aedc13e7f4551eaa97b855496148b573c2176\n" }, { "commit": "efe33319f7129cf33b6036377feeb8c051c271ee", "tree": "080d1e4ec52120219ed6e57e74a551271dc7da98", "parents": [ "b3d3c2ae577f41b1d6e656d1fc55dd3df158d033" ], "author": { "name": "Motomu Utsumi", "email": "motomuman@google.com", "time": "Tue Mar 18 15:08:15 2025 +0900" }, "committer": { "name": "Maciej Żenczykowski", "email": "maze@google.com", "time": "Tue Mar 18 12:15:39 2025 -0700" }, "message": "Add method to update btf_var_secinfo.offset\n\nBpf loader needs to fix btf_var_secinfo.offset based on ELF\u0027s string\nsection.\n\nBug: 403381101\nTest: boot\nChange-Id: I8382d0ee3e0fa7f0a3b825eca9cdcf40ccce9532\n" }, { "commit": "b3d3c2ae577f41b1d6e656d1fc55dd3df158d033", "tree": "33ab7d85194e63917207828ccc21694345167a3a", "parents": [ "712088dff3dbb30f8f8b85e3d9547bf41bf1e1f3" ], "author": { "name": "Motomu Utsumi", "email": "motomuman@google.com", "time": "Tue Mar 18 15:06:34 2025 +0900" }, "committer": { "name": "Maciej Żenczykowski", "email": "maze@google.com", "time": "Tue Mar 18 11:46:16 2025 -0700" }, "message": "Add method to update btf_type.size for BTF_KIND_DATASEC\n\nsize in btf_type of BTF_KIND_DATASEC is 0 at compilation time.\nSo bpf loader needs to update to actual size based on ELF\u0027s section\nsize.\n\nBug: 403381101\nTest: boot\nChange-Id: I78fb26a5b8eeb120044b5737667f472fac51d79f\n" }, { "commit": "712088dff3dbb30f8f8b85e3d9547bf41bf1e1f3", "tree": "2b773dbcf360853ba454ce6d6c1b0a6c89b29acf", "parents": [ "e149a49c7dfbeb8f94b746321f6ea01bcb66a859" ], "author": { "name": "Motomu Utsumi", "email": "motomuman@google.com", "time": "Tue Mar 18 14:52:02 2025 +0900" }, "committer": { "name": "Maciej Żenczykowski", "email": "maze@google.com", "time": "Tue Mar 18 11:41:17 2025 -0700" }, "message": "Enable libbpf logging in bpf loader\n\nBug: 403381101\nTest: boot\nChange-Id: I039ad8990bb722bfd6eb9f6c4d927b699475b7f6\n" }, { "commit": "cbc5b0e393769925bdc3f36d999ca459b31a7143", "tree": "1724037c41ab75e672af5ea646b256eb8926be60", "parents": [ "561dfa0514ca1c3a4340306a37d11a81b880b896", "6c769d151a4f2cbc79896a5b16290317dd6b575f" ], "author": { "name": "Quang Luong", "email": "qal@google.com", "time": "Tue Mar 18 04:17:51 2025 -0700" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Mar 18 04:17:51 2025 -0700" }, "message": "Merge changes Id3eba714,I595ba207 into main am: e149a49c7d am: 6c769d151a\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/3548741\n\nChange-Id: Icd0115e7ed5306f70b57ef969d2a5e0f92ef645d\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "561dfa0514ca1c3a4340306a37d11a81b880b896", "tree": "d95a939abd35ce36f8cb0a22fa5209ed629a30f0", "parents": [ "ad5ba37cd1318a3ba7bcbb0443efd5443926e28e", "bfc2512e16859f37a5cb0b346b9e166e69630cd7" ], "author": { "name": "Maciej Żenczykowski", "email": "maze@google.com", "time": "Tue Mar 18 04:17:38 2025 -0700" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Mar 18 04:17:38 2025 -0700" }, "message": "Merge \"clatd: drop system real uid/gid in favour of clat\" into main am: cb8033b8fb am: bfc2512e16\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/3548305\n\nChange-Id: I4974502b763a652d2799cefc01436ae708325a59\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "ad5ba37cd1318a3ba7bcbb0443efd5443926e28e", "tree": "04932abe59d9b5a6615545a76b3ab0b863d1f6ee", "parents": [ "57e43de86fda2ed045d52cc78ffe980583fcde57", "ed566c5cb925071dbf5b7809640dc6ab502cc9e7" ], "author": { "name": "Yuyang Huang", "email": "yuyanghuang@google.com", "time": "Tue Mar 18 04:17:24 2025 -0700" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Mar 18 04:17:24 2025 -0700" }, "message": "Merge \"Update ApfIntegrationTest for APFv6/v6.1 requirements\" into main am: a03654ad70 am: ed566c5cb9\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/3547682\n\nChange-Id: Id604c786b1842297826a3e9f94ad06efd507c700\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "57e43de86fda2ed045d52cc78ffe980583fcde57", "tree": "dc24904368a7c371a620f2949cacab021344575c", "parents": [ "9f798c2fd7c70f1d9a5def16b9bfdf84c16edda7", "4a560d10d4ca20cf73296774daa48d99f51de3db" ], "author": { "name": "Jean Chalard", "email": "jchalard@google.com", "time": "Tue Mar 18 04:17:07 2025 -0700" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Mar 18 04:17:07 2025 -0700" }, "message": "Merge changes I71abf9d0,I57f25f5e,If6b15419 into main am: 6f2b294fd0 am: 4a560d10d4\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/3548745\n\nChange-Id: I4f1d5be3272b8864b78ea698142fc3c535ae4890\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "6c769d151a4f2cbc79896a5b16290317dd6b575f", "tree": "d4155f7f7a0ed35475796c0b75714ebfeb4baea1", "parents": [ "bfc2512e16859f37a5cb0b346b9e166e69630cd7", "e149a49c7dfbeb8f94b746321f6ea01bcb66a859" ], "author": { "name": "Quang Luong", "email": "qal@google.com", "time": "Tue Mar 18 04:16:11 2025 -0700" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Mar 18 04:16:11 2025 -0700" }, "message": "Merge changes Id3eba714,I595ba207 into main am: e149a49c7d\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/3548741\n\nChange-Id: I46b620fb73d6bd9b8ab7233b889b68530ac5ad44\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "bfc2512e16859f37a5cb0b346b9e166e69630cd7", "tree": "7196bc5c40937e1b8a6ae9a09e77f8ca157c9afb", "parents": [ "ed566c5cb925071dbf5b7809640dc6ab502cc9e7", "cb8033b8fb1eb0e53c7df5cca168d106636059cd" ], "author": { "name": "Maciej Żenczykowski", "email": "maze@google.com", "time": "Tue Mar 18 04:15:43 2025 -0700" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Mar 18 04:15:43 2025 -0700" }, "message": "Merge \"clatd: drop system real uid/gid in favour of clat\" into main am: cb8033b8fb\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/3548305\n\nChange-Id: I3769e0cf5afe8fb1b8fa11da2457211c9524440b\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "9f798c2fd7c70f1d9a5def16b9bfdf84c16edda7", "tree": "74e01249c1549a97bccb9b285c82ecaf798053ff", "parents": [ "b8e602d2d57d8be70e577f0babd96d06d311b992", "d5f9d2fe69e6456449619f97af11bd5cf21d2b54" ], "author": { "name": "Sandro Montanari", "email": "sandrom@google.com", "time": "Tue Mar 18 04:15:36 2025 -0700" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Mar 18 04:15:36 2025 -0700" }, "message": "Merge \"Add NetworkSecurityUnitTests to tethering-mainline-presubmit\" into main am: 9a03538a23 am: d5f9d2fe69\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/3527510\n\nChange-Id: I919c52e21d72520a053e53114e2846f9f803ba54\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "ed566c5cb925071dbf5b7809640dc6ab502cc9e7", "tree": "d455b45ba2e54146018b8ed2950307e8d0cab77d", "parents": [ "4a560d10d4ca20cf73296774daa48d99f51de3db", "a03654ad70360ca1cb75665de77b7d9e6e104f71" ], "author": { "name": "Yuyang Huang", "email": "yuyanghuang@google.com", "time": "Tue Mar 18 04:14:54 2025 -0700" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Mar 18 04:14:54 2025 -0700" }, "message": "Merge \"Update ApfIntegrationTest for APFv6/v6.1 requirements\" into main am: a03654ad70\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/3547682\n\nChange-Id: I683b2a1be0379029ced4e29d717425deb11b9534\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "e149a49c7dfbeb8f94b746321f6ea01bcb66a859", "tree": "d4155f7f7a0ed35475796c0b75714ebfeb4baea1", "parents": [ "cb8033b8fb1eb0e53c7df5cca168d106636059cd", "73b09281c0b8f952bbf6e350bdfb9c52b39ad49a" ], "author": { "name": "Quang Luong", "email": "qal@google.com", "time": "Tue Mar 18 04:12:57 2025 -0700" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Tue Mar 18 04:12:57 2025 -0700" }, "message": "Merge changes Id3eba714,I595ba207 into main\n\n* changes:\n Add CtsTetheringUtils methods for wifi tethering without permission\n Skip stopTetheringRequest tests if tethering isn\u0027t supported\n" }, { "commit": "cb8033b8fb1eb0e53c7df5cca168d106636059cd", "tree": "7196bc5c40937e1b8a6ae9a09e77f8ca157c9afb", "parents": [ "a03654ad70360ca1cb75665de77b7d9e6e104f71", "19199ca6887b83622031517f54cf9f55e9d09d25" ], "author": { "name": "Maciej Żenczykowski", "email": "maze@google.com", "time": "Tue Mar 18 03:55:39 2025 -0700" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Tue Mar 18 03:55:39 2025 -0700" }, "message": "Merge \"clatd: drop system real uid/gid in favour of clat\" into main" }, { "commit": "a03654ad70360ca1cb75665de77b7d9e6e104f71", "tree": "d455b45ba2e54146018b8ed2950307e8d0cab77d", "parents": [ "6f2b294fd0b9a21459d46f3e2d6b90a8d567f7c1", "4797563fd3a691e2a281d94ff8b651b81ab8881e" ], "author": { "name": "Yuyang Huang", "email": "yuyanghuang@google.com", "time": "Tue Mar 18 03:29:33 2025 -0700" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Tue Mar 18 03:29:33 2025 -0700" }, "message": "Merge \"Update ApfIntegrationTest for APFv6/v6.1 requirements\" into main" }, { "commit": "c2cf5ea823d94f19d523414d0349e9b0c0dc6e1b", "tree": "ba282e84e33918baae4ce08b944021efb7a01029", "parents": [ "391ec5d99c25bd663f240705a6c6bb15fe474ef7" ], "author": { "name": "Chalard Jean", "email": "jchalard@google.com", "time": "Mon Mar 17 14:36:03 2025 +0900" }, "committer": { "name": "Chalard Jean", "email": "jchalard@google.com", "time": "Tue Mar 18 19:23:58 2025 +0900" }, "message": "Process enqueued messages from the NAI synchronously.\n\nAs ConnectivityService is ready to accept messages about a network\nagent, it should process messages immediately and before messages\nfrom other agents are processed.\n\nThis is because of minute ordering issues between the agent process,\nConnectivityService and the network stack. In particular, as the agent\nis created, ConnectivityService requests the NetworkMonitor from the\nnetwork stack ; while this is happening, the process creating the\nagent may have sent a bunch of other messages... including, but not\nlimited to, disconnects or creation of other agents.\n\nThe operative case is the case where a disconnect is in the queue.\n\nagent1.register\n → CS creates the monitor for agent 1\nagent1.unregisterAfterReplacement\n → CS enqueues in agent1 pending creation of the monitor\nagent2.register\n → CS creates the monitor for agent 2\nmonitor for agent 1 is created\n → CS posts a message to complete agent 1 creation\nmonitor for agent 2 is created\n → CS posts a message to complete agent 2 creation\nagent 1 creation completes\n → CS re-posts the unregisterAfterReplacement message\nagent 2 creation completes\n...and this is where things fail, because unregistering agent 1\nisn\u0027t processed yet. If they use the same interface (which is\na common use case for unregisterAfterReplacement) then this\ncreation will fail.\n\nTo address this, this patch will process all agent1 messages\nsynchronously as the creation completes. It will solve the case\nabove, and it passes all tests for early network creation.\n\nHowever, it is worth noting that this is not actually correct,\nbecause it does not guarantee that all messages are processed\nin order. Namely, two agents have separate queues and\ntherefore if they send interleaved messages while CS is\nwaiting for the NetworkMonitor to be created, the order of\nthese messages will be lost. e.g.\n\nagent1.register\nagent2.register\nagent1.unregisterAfterReplacement\n\nThe case above SHOULD fail if the agents have the same\ninterface, but with this patch it will likely succeed because\nthe call to agent1.unregisterAfterReplacement will be received\nwhile the two NetworkMonitor are being created, and then\nbe processed as agent1 finishes registration.\n\nThe correct change, therefore, would really enqueue all\nmessages when *any* agent (of the same process at least)\nis being created. However, it is arguable whether it\u0027s worth\nbuilding that change over this one, and it is even arguable\nwhether the behavior of this here change might not be\nbetter, insofar as two agent messages are generally\nunrelated to each other except for unregistering.\n\nTest: CtsNetTestCases ConnectivityCoverageTests\nChange-Id: Idf75e4e96c67a456cf0979a79321603b46e8c99c\n" }, { "commit": "391ec5d99c25bd663f240705a6c6bb15fe474ef7", "tree": "c9536b68ae8c0078e01b4b27a8d4e9ba97b31a7f", "parents": [ "6f2b294fd0b9a21459d46f3e2d6b90a8d567f7c1" ], "author": { "name": "Chalard Jean", "email": "jchalard@google.com", "time": "Fri Mar 07 10:54:52 2025 +0900" }, "committer": { "name": "Chalard Jean", "email": "jchalard@google.com", "time": "Tue Mar 18 19:23:57 2025 +0900" }, "message": "Remove the queue on the NetworkAgent side\n\nNow that the system server has a queue doing this job,\nthe queue on the network agent side can be removed.\n\nTest: ConnectivityCoverageTests, CtsNetTestCases\nChange-Id: Idf0435f447cfdd28d829a867d1085771837c6f9b\n" }, { "commit": "4a560d10d4ca20cf73296774daa48d99f51de3db", "tree": "83e813013d7f8747a5e506217763988f4279a7ce", "parents": [ "d5f9d2fe69e6456449619f97af11bd5cf21d2b54", "6f2b294fd0b9a21459d46f3e2d6b90a8d567f7c1" ], "author": { "name": "Jean Chalard", "email": "jchalard@google.com", "time": "Tue Mar 18 03:19:38 2025 -0700" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Mar 18 03:19:38 2025 -0700" }, "message": "Merge changes I71abf9d0,I57f25f5e,If6b15419 into main am: 6f2b294fd0\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/3548745\n\nChange-Id: I7c6bc63a9f1a8d2a2a9a403aff26b34d4128e296\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "6f2b294fd0b9a21459d46f3e2d6b90a8d567f7c1", "tree": "83e813013d7f8747a5e506217763988f4279a7ce", "parents": [ "9a03538a23f5329c2acb4ef11d734b0c4fcbd8c6", "3c040009c59a5579b13bb1c1f8a41d5d8a88464a" ], "author": { "name": "Jean Chalard", "email": "jchalard@google.com", "time": "Tue Mar 18 03:19:07 2025 -0700" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Tue Mar 18 03:19:07 2025 -0700" }, "message": "Merge changes I71abf9d0,I57f25f5e,If6b15419 into main\n\n* changes:\n Reapply \"Add a queue system server-side for NetworkAgent\"\n Reapply \"Unify registration and NM assignment in NAI\"\n Reapply \"Return the registry in registerNetworkAgent.\"\n" }, { "commit": "d5f9d2fe69e6456449619f97af11bd5cf21d2b54", "tree": "1d7aa93acdb6d9fe6afc89085eeef1714d68867f", "parents": [ "03dfa95c3127121dc8ad05de23c67bcfb6a7d873", "9a03538a23f5329c2acb4ef11d734b0c4fcbd8c6" ], "author": { "name": "Sandro Montanari", "email": "sandrom@google.com", "time": "Tue Mar 18 03:19:01 2025 -0700" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Mar 18 03:19:01 2025 -0700" }, "message": "Merge \"Add NetworkSecurityUnitTests to tethering-mainline-presubmit\" into main am: 9a03538a23\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/3527510\n\nChange-Id: If3884806ad628269f8c49362086b2824f39a7161\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "5ae193ae36ec7621a5f7bcf387997c5081e9c239", "tree": "510c9d7e217f81fbe99a7bf004468536325a1886", "parents": [ "19199ca6887b83622031517f54cf9f55e9d09d25" ], "author": { "name": "Maciej Żenczykowski", "email": "maze@google.com", "time": "Fri Mar 14 12:44:50 2025 -0700" }, "committer": { "name": "Maciej Żenczykowski", "email": "maze@google.com", "time": "Tue Mar 18 02:57:06 2025 -0700" }, "message": "clatd: implement seccomp system call protection\n\nbut only enable it in enforcing mode on aarch64,\nsince that gets good test coverage via Pixel\non GoogleGuest ipv6-only wifi network\nand (for example) T-Mobile US cellular.\n\nFor other architectures this will only result\nin (automatically ratelimitted to at most 5/s)\naudit logs for any \u0027unusual\u0027 system calls.\n\nTest: TreeHugger, manually on Pixel on GoogleGuest wifi\nSigned-off-by: Maciej Żenczykowski \u003cmaze@google.com\u003e\nChange-Id: Id14c6d9db8d7b4652c7358cac101a82ef09843e0\n" }, { "commit": "b8e602d2d57d8be70e577f0babd96d06d311b992", "tree": "e0f68870cbcf476533aa0e9fabc6078999b8bd62", "parents": [ "33e4070cc65bce791bd8c80ae5a26cc6eae06c23", "03dfa95c3127121dc8ad05de23c67bcfb6a7d873" ], "author": { "name": "Remi NGUYEN VAN", "email": "reminv@google.com", "time": "Tue Mar 18 02:56:29 2025 -0700" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Mar 18 02:56:29 2025 -0700" }, "message": "Merge \"Collect diagnostics without storage permission\" into main am: 899737e0e0 am: 03dfa95c31\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/3507715\n\nChange-Id: Iede638c8d9d50cc9f288f162da5a62b93e9279e9\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "33e4070cc65bce791bd8c80ae5a26cc6eae06c23", "tree": "ced937e11a09e99a76aa7cbc448e7881ddc80ee9", "parents": [ "d16181ad49f9869526b87491bb0283dcb2b83f5d", "58b5b18514d74ac83b27510f318a139e2b2683e0" ], "author": { "name": "Maciej Żenczykowski", "email": "maze@google.com", "time": "Tue Mar 18 02:56:16 2025 -0700" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Mar 18 02:56:16 2025 -0700" }, "message": "Merge \"Fix missing function in NetworkStaticLibHostPythonTests\" into main am: d492666256 am: 58b5b18514\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/3547922\n\nChange-Id: Idbae596b097988dec884ee591ee13b8143680409\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "d16181ad49f9869526b87491bb0283dcb2b83f5d", "tree": "2e441a7455bfbb3db904da042b94ba2f1fea5599", "parents": [ "60c38fda65abb8baa8f37e6305d91ef56bafc467", "bd0710fc19e78f4dd26f822fd1217329dde22d41" ], "author": { "name": "Maciej Żenczykowski", "email": "maze@google.com", "time": "Tue Mar 18 02:55:58 2025 -0700" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Mar 18 02:55:58 2025 -0700" }, "message": "Merge \"Add IGMPv3 offload for APFv6 multi-devices tests\" into main am: e634a7da38 am: bd0710fc19\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/3535020\n\nChange-Id: I26ba34ef23c39f8c4962b61cd52649193b14e6e5\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "9a03538a23f5329c2acb4ef11d734b0c4fcbd8c6", "tree": "1d7aa93acdb6d9fe6afc89085eeef1714d68867f", "parents": [ "899737e0e05349ab4f941e8efbaaeabe4ae4d73e", "5a7eeec399815e7ede293ffd49b7337304a2b1c9" ], "author": { "name": "Sandro Montanari", "email": "sandrom@google.com", "time": "Tue Mar 18 02:49:34 2025 -0700" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Tue Mar 18 02:49:34 2025 -0700" }, "message": "Merge \"Add NetworkSecurityUnitTests to tethering-mainline-presubmit\" into main" }, { "commit": "03dfa95c3127121dc8ad05de23c67bcfb6a7d873", "tree": "87d062d2d23710452dc07f4ea3947ca48aad0439", "parents": [ "58b5b18514d74ac83b27510f318a139e2b2683e0", "899737e0e05349ab4f941e8efbaaeabe4ae4d73e" ], "author": { "name": "Remi NGUYEN VAN", "email": "reminv@google.com", "time": "Tue Mar 18 02:32:33 2025 -0700" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Mar 18 02:32:33 2025 -0700" }, "message": "Merge \"Collect diagnostics without storage permission\" into main am: 899737e0e0\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/3507715\n\nChange-Id: Icca06de94d387f2bb22f4727c26c75edb19e2a2d\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "58b5b18514d74ac83b27510f318a139e2b2683e0", "tree": "2d2dfe6e67a0561581e6eee5b88777561d207101", "parents": [ "bd0710fc19e78f4dd26f822fd1217329dde22d41", "d4926662562ae443e11233384eb0ded4be7f8674" ], "author": { "name": "Maciej Żenczykowski", "email": "maze@google.com", "time": "Tue Mar 18 02:32:19 2025 -0700" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Mar 18 02:32:19 2025 -0700" }, "message": "Merge \"Fix missing function in NetworkStaticLibHostPythonTests\" into main am: d492666256\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/3547922\n\nChange-Id: I9247d1677d86e5e4d136cd0fb11bf1fd9d29c973\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "bd0710fc19e78f4dd26f822fd1217329dde22d41", "tree": "81979b62af054796d89f722d260dff5376688250", "parents": [ "b583a8a8579c72de979bde4317c24abdaaafaaec", "e634a7da386dfa53885fc8eaeb300df77db7a9cb" ], "author": { "name": "Maciej Żenczykowski", "email": "maze@google.com", "time": "Tue Mar 18 02:31:52 2025 -0700" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Mar 18 02:31:52 2025 -0700" }, "message": "Merge \"Add IGMPv3 offload for APFv6 multi-devices tests\" into main am: e634a7da38\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/3535020\n\nChange-Id: I5419f1bc353474b470c0cb84d455b0bdea1780e4\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "4797563fd3a691e2a281d94ff8b651b81ab8881e", "tree": "6eb10812b042ba53666ca7b7ad933c884f873a93", "parents": [ "9e15d35d0176aad8f105be1a49075955999aeb91" ], "author": { "name": "Yuyang Huang", "email": "yuyanghuang@google.com", "time": "Tue Mar 18 18:09:17 2025 +0900" }, "committer": { "name": "Yuyang Huang", "email": "yuyanghuang@google.com", "time": "Tue Mar 18 18:10:06 2025 +0900" }, "message": "Update ApfIntegrationTest for APFv6/v6.1 requirements\n\nThis commit updates ApfIntegrationTest to reflect the latest\nrequirements for supporting APFv6 and APFv6.1, including their\nrespective memory requirements.\n\nTest: TH\nChange-Id: I29e8e692eaf8e378fea99bda36c752d9d729ed86\n" }, { "commit": "899737e0e05349ab4f941e8efbaaeabe4ae4d73e", "tree": "87d062d2d23710452dc07f4ea3947ca48aad0439", "parents": [ "d4926662562ae443e11233384eb0ded4be7f8674", "8b555c29c3114e910d2d4d94dff1aed2f91da9d5" ], "author": { "name": "Remi NGUYEN VAN", "email": "reminv@google.com", "time": "Tue Mar 18 02:05:21 2025 -0700" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Tue Mar 18 02:05:21 2025 -0700" }, "message": "Merge \"Collect diagnostics without storage permission\" into main" }, { "commit": "c992100a71dfd7e2d5b91df4ef3b66ef41259790", "tree": "e51992b87eaf8346654991ebaddf9006659989b7", "parents": [ "d4926662562ae443e11233384eb0ded4be7f8674" ], "author": { "name": "Jimi Chen", "email": "jimictw@google.com", "time": "Thu Mar 13 06:36:10 2025 +0000" }, "committer": { "name": "Maciej Żenczykowski", "email": "maze@google.com", "time": "Tue Mar 18 01:49:50 2025 -0700" }, "message": "Add Ping6 offload for APFv6 multi-devices tests\n\nTest: m connectivity_multi_devices_snippet \u0026\u0026 atest CtsConnectivityMultiDevicesTestCases\nChange-Id: I11b7cef13562884235bd4e505adec1fff381e7ab\n" }, { "commit": "d4926662562ae443e11233384eb0ded4be7f8674", "tree": "2d2dfe6e67a0561581e6eee5b88777561d207101", "parents": [ "e634a7da386dfa53885fc8eaeb300df77db7a9cb", "e6c9b28c2b3bbefa0498e382f214f68f047779a8" ], "author": { "name": "Maciej Żenczykowski", "email": "maze@google.com", "time": "Tue Mar 18 01:47:31 2025 -0700" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Tue Mar 18 01:47:31 2025 -0700" }, "message": "Merge \"Fix missing function in NetworkStaticLibHostPythonTests\" into main" }, { "commit": "e634a7da386dfa53885fc8eaeb300df77db7a9cb", "tree": "81979b62af054796d89f722d260dff5376688250", "parents": [ "944a1d28559a78d03f7138367903a97fde6d92c5", "8d552bf2c0ed3d551f8b87680356a25e43a12f66" ], "author": { "name": "Maciej Żenczykowski", "email": "maze@google.com", "time": "Tue Mar 18 01:46:48 2025 -0700" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Tue Mar 18 01:46:48 2025 -0700" }, "message": "Merge \"Add IGMPv3 offload for APFv6 multi-devices tests\" into main" }, { "commit": "60c38fda65abb8baa8f37e6305d91ef56bafc467", "tree": "7c68b9ec44e8932a8dfc6131cb167ac022548167", "parents": [ "eced008945ee1c052654be9f13b00c984c8fb3d7", "b583a8a8579c72de979bde4317c24abdaaafaaec" ], "author": { "name": "Lorenzo Colitti", "email": "lorenzo@google.com", "time": "Tue Mar 18 01:22:19 2025 -0700" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Mar 18 01:22:19 2025 -0700" }, "message": "Merge changes from topic \"vpn-type-oem-enterprise\" into main am: 944a1d2855 am: b583a8a857\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/3548739\n\nChange-Id: I5de7e81398238041761e87e4d24a3b04b718fa41\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "eced008945ee1c052654be9f13b00c984c8fb3d7", "tree": "98107622dfd261fb64bc29081ce124b0c5e1c5a4", "parents": [ "29df93786c0d190291df008d2d8d0c43726b4159", "0e403f1e8a4b5abfb6b670eea5ebd46739cf1fe7" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Tue Mar 18 01:22:02 2025 -0700" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Mar 18 01:22:02 2025 -0700" }, "message": "Merge changes Id80bfca1,I8254c3f4 into main am: 8aff973a30 am: 0e403f1e8a\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/3548304\n\nChange-Id: I09b7999e839f9e2b271540e56a5aac01a04465cb\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "29df93786c0d190291df008d2d8d0c43726b4159", "tree": "8d350fc692188a8c6f528554e63dfacd0de2f7f5", "parents": [ "38f5e7dd1215847d8b549e08aad11c1cab611fb9", "e96be8f94995f0792dfb6e03343c86395177d940" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Tue Mar 18 01:21:48 2025 -0700" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Mar 18 01:21:48 2025 -0700" }, "message": "Merge \"clatd: move send_dad out of event_loop() into main()\" into main am: 2413654ad8 am: e96be8f949\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/3548302\n\nChange-Id: I8b4d31b0d2e6bc38eae42158b047311e8fac9812\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "38f5e7dd1215847d8b549e08aad11c1cab611fb9", "tree": "f3cb3c4604cc76d6335d5038844b8403aeb4263b", "parents": [ "a90d2ae724a16041fdc65a88896fd03c1493d04b", "42b1d75423331967b463bd63dcb23591f7b33f77" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Tue Mar 18 01:21:35 2025 -0700" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Mar 18 01:21:35 2025 -0700" }, "message": "Merge \"clatd: embed CLATD_VERSION directly in log string\" into main am: 13070faab5 am: 42b1d75423\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/3548301\n\nChange-Id: I100ad8dccd865f90f42944b640f639886ef2b653\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "b583a8a8579c72de979bde4317c24abdaaafaaec", "tree": "f49b586ae195553de0f10aad90fe8f9572e55a02", "parents": [ "0e403f1e8a4b5abfb6b670eea5ebd46739cf1fe7", "944a1d28559a78d03f7138367903a97fde6d92c5" ], "author": { "name": "Lorenzo Colitti", "email": "lorenzo@google.com", "time": "Tue Mar 18 00:59:20 2025 -0700" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Mar 18 00:59:20 2025 -0700" }, "message": "Merge changes from topic \"vpn-type-oem-enterprise\" into main am: 944a1d2855\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/3548739\n\nChange-Id: Id5829076d95d1cb2efec6e5e5fd72ed9a6e09c7b\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "0e403f1e8a4b5abfb6b670eea5ebd46739cf1fe7", "tree": "bd8be19962d57363a30acc69147c5d4e042d2caa", "parents": [ "e96be8f94995f0792dfb6e03343c86395177d940", "8aff973a30043c7d2ad890ee1ad017588d3b0775" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Tue Mar 18 00:58:09 2025 -0700" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Mar 18 00:58:09 2025 -0700" }, "message": "Merge changes Id80bfca1,I8254c3f4 into main am: 8aff973a30\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/3548304\n\nChange-Id: Ic49fc27ef9245073315fec8c560ac0062617fa83\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "e96be8f94995f0792dfb6e03343c86395177d940", "tree": "932529b5c14c964fe580c9465b7d59aa1008d74f", "parents": [ "42b1d75423331967b463bd63dcb23591f7b33f77", "2413654ad8ec21c3af125b8e7e6d38979a87028a" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Tue Mar 18 00:57:56 2025 -0700" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Mar 18 00:57:56 2025 -0700" }, "message": "Merge \"clatd: move send_dad out of event_loop() into main()\" into main am: 2413654ad8\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/3548302\n\nChange-Id: I3cf47ac1821431cf7aa8ec13394279cf55c9e03e\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "42b1d75423331967b463bd63dcb23591f7b33f77", "tree": "e68983481e18e787e2d12d9da8997cafd13dc468", "parents": [ "a61499d63f782caf48f3aaf6bf841c59ee3e152d", "13070faab5f69509a12cea2d127e2ece56184c0f" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Tue Mar 18 00:57:40 2025 -0700" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Mar 18 00:57:40 2025 -0700" }, "message": "Merge \"clatd: embed CLATD_VERSION directly in log string\" into main am: 13070faab5\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/3548301\n\nChange-Id: Ic0f6d494a2f34681ab72087755a38c9c14420d8f\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "19199ca6887b83622031517f54cf9f55e9d09d25", "tree": "a64384a75ad922659863fc253f2972182e41487d", "parents": [ "944a1d28559a78d03f7138367903a97fde6d92c5" ], "author": { "name": "Maciej Żenczykowski", "email": "maze@google.com", "time": "Fri Mar 14 12:08:05 2025 -0700" }, "committer": { "name": "Maciej Żenczykowski", "email": "maze@google.com", "time": "Tue Mar 18 00:51:59 2025 -0700" }, "message": "clatd: drop system real uid/gid in favour of clat\n\n(minor security improvement)\n\nTest: TreeHugger\nSigned-off-by: Maciej Żenczykowski \u003cmaze@google.com\u003e\nChange-Id: Ibe2a75d83f7fa48ff555d80a4b9cbb0ab68ab8a8\n" }, { "commit": "944a1d28559a78d03f7138367903a97fde6d92c5", "tree": "f49b586ae195553de0f10aad90fe8f9572e55a02", "parents": [ "8aff973a30043c7d2ad890ee1ad017588d3b0775", "fd89cf529ae1cfedd65f058eaeb3b81cdacd5974" ], "author": { "name": "Lorenzo Colitti", "email": "lorenzo@google.com", "time": "Tue Mar 18 00:50:13 2025 -0700" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Tue Mar 18 00:50:13 2025 -0700" }, "message": "Merge changes from topic \"vpn-type-oem-enterprise\" into main\n\n* changes:\n Treat new OEM VPN types like the corresponding non-OEM types.\n Add more NativeVpnType AIDL constants for OEM-specific VPNs.\n" }, { "commit": "8aff973a30043c7d2ad890ee1ad017588d3b0775", "tree": "bd8be19962d57363a30acc69147c5d4e042d2caa", "parents": [ "2413654ad8ec21c3af125b8e7e6d38979a87028a", "0372f296b515f90dde1120bebd24e405a7a75525" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Tue Mar 18 00:42:37 2025 -0700" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Tue Mar 18 00:42:37 2025 -0700" }, "message": "Merge changes Id80bfca1,I8254c3f4 into main\n\n* changes:\n clatd: one less shutdown log line\n clatd: rework sigterm \u0026 error handling\n" }, { "commit": "a90d2ae724a16041fdc65a88896fd03c1493d04b", "tree": "53431397ccecc4ebd885c92d294489b884534d9e", "parents": [ "c93e7628678fbb37a90f4195142ae220c94551a3", "a61499d63f782caf48f3aaf6bf841c59ee3e152d" ], "author": { "name": "Quang Luong", "email": "qal@google.com", "time": "Tue Mar 18 00:35:28 2025 -0700" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Mar 18 00:35:28 2025 -0700" }, "message": "Merge \"Add carrier privilege utils to CarrierConfigRule\" into main am: ab6342b70e am: a61499d63f\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/3546239\n\nChange-Id: I430dd49accff8b02b9cbd6392c957193fa1c0a41\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "2413654ad8ec21c3af125b8e7e6d38979a87028a", "tree": "932529b5c14c964fe580c9465b7d59aa1008d74f", "parents": [ "13070faab5f69509a12cea2d127e2ece56184c0f", "2f96f2c242a98330019a3054b53fe4795c2483aa" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Tue Mar 18 00:30:48 2025 -0700" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Tue Mar 18 00:30:48 2025 -0700" }, "message": "Merge \"clatd: move send_dad out of event_loop() into main()\" into main" }, { "commit": "13070faab5f69509a12cea2d127e2ece56184c0f", "tree": "e68983481e18e787e2d12d9da8997cafd13dc468", "parents": [ "ab6342b70e5dda2242464c85ff4a54dd208ff3cd", "1961f673d166d82713b760f0c26fe352b0eadeaa" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Tue Mar 18 00:30:47 2025 -0700" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Tue Mar 18 00:30:47 2025 -0700" }, "message": "Merge \"clatd: embed CLATD_VERSION directly in log string\" into main" }, { "commit": "73b09281c0b8f952bbf6e350bdfb9c52b39ad49a", "tree": "28adaad7b2687d3daabd176f9ac63bfdb489fe3c", "parents": [ "a4d16050f9893eb72e465c0a80c51e962a6d1dee" ], "author": { "name": "Quang Anh Luong", "email": "qal@google.com", "time": "Tue Mar 18 14:20:41 2025 +0900" }, "committer": { "name": "Quang Anh Luong", "email": "qal@google.com", "time": "Tue Mar 18 16:24:39 2025 +0900" }, "message": "Add CtsTetheringUtils methods for wifi tethering without permission\n\nDevice Owner and Carrier-privileged tethering usage relies on starting\ntethering without TETHER_PRIVILEGE permission. Add utilities to\nCtsTetheringUtils to do this.\n\nBug: 295979433\nTest: atest DeviceOwnerTest TetheringManagerTest\nChange-Id: Id3eba71481e27ccfa32f2b0588b8a74c490c5311\n" }, { "commit": "a4d16050f9893eb72e465c0a80c51e962a6d1dee", "tree": "286a15a277057156afb68851e06f7c53ab717986", "parents": [ "ab6342b70e5dda2242464c85ff4a54dd208ff3cd" ], "author": { "name": "Quang Anh Luong", "email": "qal@google.com", "time": "Tue Mar 18 16:09:46 2025 +0900" }, "committer": { "name": "Quang Anh Luong", "email": "qal@google.com", "time": "Tue Mar 18 16:24:31 2025 +0900" }, "message": "Skip stopTetheringRequest tests if tethering isn\u0027t supported\n\nBug: 402315643\nTest: atest TetheringManagerTest\n\nChange-Id: I595ba20718cd13b7c6b6d66bf540c599ef48304e\n" }, { "commit": "a61499d63f782caf48f3aaf6bf841c59ee3e152d", "tree": "0f516d15b4cd6915769f6a15d42e9f6f84f8d4e3", "parents": [ "0054a2627f4779e88084f4c94c3e298644157309", "ab6342b70e5dda2242464c85ff4a54dd208ff3cd" ], "author": { "name": "Quang Luong", "email": "qal@google.com", "time": "Mon Mar 17 23:59:05 2025 -0700" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Mar 17 23:59:05 2025 -0700" }, "message": "Merge \"Add carrier privilege utils to CarrierConfigRule\" into main am: ab6342b70e\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/3546239\n\nChange-Id: I5da9cc0d7b7507699f9cebaa8a86509fe406cd5f\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "e6c9b28c2b3bbefa0498e382f214f68f047779a8", "tree": "827f7a15461749d96e452f1d64465c16d93f55bd", "parents": [ "ab6342b70e5dda2242464c85ff4a54dd208ff3cd" ], "author": { "name": "Jimi Chen", "email": "jimictw@google.com", "time": "Tue Mar 18 06:50:41 2025 +0000" }, "committer": { "name": "Jimi Chen", "email": "jimictw@google.com", "time": "Mon Mar 17 23:56:23 2025 -0700" }, "message": "Fix missing function in NetworkStaticLibHostPythonTests\n\nThis change corrects a missing function error, which was renamed in aosp/3545962.\n\nTest: atest NetworkStaticLibHostPythonTests\nChange-Id: I2f51702adfa48f2207ef4dd79f641c8f57d15ac7\n" } ], "next": "ab6342b70e5dda2242464c85ff4a54dd208ff3cd" }