)]}' { "log": [ { "commit": "a52ecf0c5c9a5310c4a2c01232ece0804e719618", "tree": "6526c6e5f5c4bc7057ec80961078828a9cd018af", "parents": [ "44049a398356918307e775cb8f402101d6424777" ], "author": { "name": "Cole Faust", "email": "colefaust@google.com", "time": "Wed Dec 20 11:57:07 2023 -0800" }, "committer": { "name": "Cole Faust", "email": "colefaust@google.com", "time": "Wed Dec 20 11:57:07 2023 -0800" }, "message": "List baseline_filename on modules that are implititly using it\n\nlintable modules currently pick up files named \"lint-baseline.xml\" to use as the\nlint baseline implicitly. This is confusing because you could end up using the\nbaseline files in more modules than intended. Lint also has a feature where it\nrequests you remove unnecessary findings from the baseline file, so something\ncould be necessary for one module, but unnecessary for another that accidentally\npicked up the baseline.\n\nWe\u0027re removing the implicit detection of the baseline file, which requires\nall modules using it to list the baseline file explicitly.\n\nBug: 272769514\nTest: Presubmits\nChange-Id: If873a4ea20d73bb6268d83589c4fb3ebe54af664\n" }, { "commit": "44049a398356918307e775cb8f402101d6424777", "tree": "9e86eeaed22047d40d248ad397a7a7697ecfa354", "parents": [ "19d055514c1d4753cb3b22af0b9564bfe7f42f6e", "b17d60144a61eecd9f5667626fba0e9550045dec" ], "author": { "name": "Motomu Utsumi", "email": "motomuman@google.com", "time": "Mon Dec 18 13:42:47 2023 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Mon Dec 18 13:42:47 2023 +0000" }, "message": "Merge \"Remove TrunkStable.bp\" into main" }, { "commit": "19d055514c1d4753cb3b22af0b9564bfe7f42f6e", "tree": "7d4f58d6efaf75e3aa8c73e5b7670e7311ed45d1", "parents": [ "600055853897202805ef9dee36ef2c28fb1d2860", "5af24b65fe41afe0570f82de365b955964f178c5" ], "author": { "name": "Kangping Dong", "email": "wgtdkp@google.com", "time": "Mon Dec 18 08:49:44 2023 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Mon Dec 18 08:49:44 2023 +0000" }, "message": "Merge changes from topic \"mdns-subtypes\" into main\n\n* changes:\n [mdns] add service-side impl for subtypes advertising\n [mdns] add support for advertising subtypes\n" }, { "commit": "5af24b65fe41afe0570f82de365b955964f178c5", "tree": "bfa1ef09d04d3eba832486137d86da7cc6740ecb", "parents": [ "6d618d77fe2bf1d67794a2950db43fd5d41d2410" ], "author": { "name": "Kangping Dong", "email": "wgtdkp@google.com", "time": "Sun Dec 10 21:41:16 2023 +0800" }, "committer": { "name": "Kangping Dong", "email": "wgtdkp@google.com", "time": "Mon Dec 18 10:03:20 2023 +0800" }, "message": "[mdns] add service-side impl for subtypes advertising\n\nThis is the servide-side impl of the subtypes advertising added in\naosp/2608627. See that CL for more backgrounds.\n\nBug: 265095929\nTest: atest CtsNetTestCases FrameworksNetTests\nChange-Id: I3d6f96822ac89d12fe29c00f688d848297c25787\n" }, { "commit": "6d618d77fe2bf1d67794a2950db43fd5d41d2410", "tree": "b9d44193372778288272e00e12beba18b8cf6a4a", "parents": [ "b94bd28e330e440f5fc6d57521f29fecd6004e30" ], "author": { "name": "Kangping Dong", "email": "wgtdkp@google.com", "time": "Fri Dec 08 15:49:00 2023 +0800" }, "committer": { "name": "Kangping Dong", "email": "wgtdkp@google.com", "time": "Mon Dec 18 10:03:16 2023 +0800" }, "message": "[mdns] add support for advertising subtypes\n\nThis commit adds support of advertising and discovering services\nwith subtypes.\n\nWith this change, client can publish a new service with subtypes with\ncode:\n```\nNsdServiceInfo info \u003d new NsdServiceInfo();\ninfo.setServiceName(\"My Service\");\ninfo.setServiceType(\"_meshcop._udp\");\ninfo.setSubtypes(Set.of(\"_abc\"));\n\nnsdManager.registerService(info, PROTOCOL_DNS_SD, listener);\n```\n\nBug: 265095929\nTest: atest CtsNetTestCases FrameworksNetTests\nChange-Id: Ia83182e2d43002243d1ef4357d14a8056d7da14b\n" }, { "commit": "600055853897202805ef9dee36ef2c28fb1d2860", "tree": "8b67abc978b00d24d607f3bac8691a72b134928e", "parents": [ "08622b8ecb46234f0b04a684b6a02b94f0f0ca8c" ], "author": { "name": "Yang Sun", "email": "sunytt@google.com", "time": "Thu Dec 07 09:48:59 2023 +0800" }, "committer": { "name": "Yang Sun", "email": "sunytt@google.com", "time": "Sun Dec 17 17:34:39 2023 +0800" }, "message": "Add getRtmFamily for RtNetlinkRouteMessage\n\nTest: atest NetworkStaticLibTests:com.android.net.moduletests.util.netlink.RtNetlinkRouteMessageTest\nChange-Id: Ifdf5afc4f58ff55bd20cc60e23b17c3138754392\n" }, { "commit": "08622b8ecb46234f0b04a684b6a02b94f0f0ca8c", "tree": "8b40f8c36f38d1a84d04debcb52ac1a352fd0285", "parents": [ "d4195824abce77b8ad169da288cc81084b146f96" ], "author": { "name": "Yang Sun", "email": "sunytt@google.com", "time": "Wed Dec 06 19:51:44 2023 +0800" }, "committer": { "name": "Yang Sun", "email": "sunytt@google.com", "time": "Sun Dec 17 17:31:00 2023 +0800" }, "message": "Add support for multicast route in RtNetlinkRouteMessage\n\nTest: atest NetworkStaticLibTests:com.android.net.moduletests.util.netlink.RtNetlinkRouteMessageTest\nChange-Id: I2f3d69a5bda81de65e4a36e0db61d98dcf082b2d\n" }, { "commit": "d4195824abce77b8ad169da288cc81084b146f96", "tree": "076294e9990951f09c39143bb8040f874eca9971", "parents": [ "0b2d75c09a08b4551117a4bb5b1fbb05710b9856" ], "author": { "name": "Yang Sun", "email": "sunytt@google.com", "time": "Wed Dec 06 19:34:49 2023 +0800" }, "committer": { "name": "Yang Sun", "email": "sunytt@google.com", "time": "Sat Dec 16 21:58:15 2023 +0800" }, "message": "Add support for long values in StructNlAttr\n\nTest: atest NetworkStaticLibTests:com.android.net.moduletests.util.netlink.StructNlAttrTest\nChange-Id: Iaaa7f63a2b550f017a8c75f84b9d69bf9e829a8c\n" }, { "commit": "0b2d75c09a08b4551117a4bb5b1fbb05710b9856", "tree": "9559c222e89d80363c66a079de32e98973656497", "parents": [ "e450df69817eaff5c3655fcc87b6014d1c4327a6" ], "author": { "name": "Yang Sun", "email": "sunytt@google.com", "time": "Wed Dec 06 19:46:56 2023 +0800" }, "committer": { "name": "Yang Sun", "email": "sunytt@google.com", "time": "Sat Dec 16 21:58:07 2023 +0800" }, "message": "Add support for processing netlink dump messages\n\nTest: atest NetworkStaticLibTests:com.android.net.moduletests.util.netlink.NetlinkUtilsTest\nChange-Id: I15e208dca5ed6a723585f79cf09276017bc8a885\n" }, { "commit": "e450df69817eaff5c3655fcc87b6014d1c4327a6", "tree": "5544bdfbd8048faa3a03b68fb1da26f2deff16fb", "parents": [ "3f8cb43ff16d9603074ba401bc243fa86f42f0e2" ], "author": { "name": "Xinyi Zhou", "email": "zxy@google.com", "time": "Tue Dec 12 19:52:19 2023 +0000" }, "committer": { "name": "Xinyi Zhou", "email": "zxy@google.com", "time": "Wed Dec 13 20:24:19 2023 +0000" }, "message": "[nearby] Fix test failure\n\nTest: -m\nFix: 303338703\nIgnore-AOSP-First: nearby not in aosp yet\n(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:f6fdf4cf7bc9cd9d50e91d7895e11f684a49a5db)\nMerged-In: I7048917f5345f55364626901b533fee3d3856bf7\nChange-Id: I7048917f5345f55364626901b533fee3d3856bf7\n" }, { "commit": "3f8cb43ff16d9603074ba401bc243fa86f42f0e2", "tree": "03c616064357776def3b4f757ea041e6136ca6e6", "parents": [ "a2b80663543ac839bce37e8bc3865edd6fb2a501", "d1625679fba0b54b74ac95aa9adf9df60996df76" ], "author": { "name": "Xinyi Zhou", "email": "zxy@google.com", "time": "Wed Dec 13 20:23:12 2023 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Wed Dec 13 20:23:12 2023 +0000" }, "message": "Merge \"Exclude user build devices for the test\" into main" }, { "commit": "a2b80663543ac839bce37e8bc3865edd6fb2a501", "tree": "301699170f583a14e2211c2ef9da4d749090b3d1", "parents": [ "07e425cd0b311d86c02e59785a74213f78a5da3f", "f83d4df182c853b1718e22ba8ee3b8201f49d8e6" ], "author": { "name": "Xinyi Zhou", "email": "zxy@google.com", "time": "Wed Dec 13 19:51:46 2023 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Wed Dec 13 19:51:46 2023 +0000" }, "message": "Merge changes from topic \"cherrypicker-L22800030000756195:N75200030012855151\" into main\n\n* changes:\n [nearby] Add nearby_enable_ble_in_init flag\n Revert \"[nearby] Add disable logic\"\n [nearby] Add disable logic\n [nearby] Log changes\n [nearby] Sync discoveryTimestamp field name\n [nearby] Enable BLE when init\n [nearby] Add logs to broadcaster\n [nearby] Add discoveryTimestamp field\n [nearby] Fix flakeness in the unit test\n [nearby][clean up] Remove useless legacy code\n [nearby] Fix the user-debug only test\n [nearby] Catches NPE in ChreDiscoveryProvider\n [nearby] Update README to add build env script\n" }, { "commit": "07e425cd0b311d86c02e59785a74213f78a5da3f", "tree": "32cf261271978e409c2c8b2c9be9f31dacad6869", "parents": [ "9efc429906420b95a30708e45c4464a7738fe240", "3976e49e400cd7f0c061af8b74068cbf0c538bcf" ], "author": { "name": "Yan Yan", "email": "evitayan@google.com", "time": "Wed Dec 13 18:26:25 2023 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Wed Dec 13 18:26:25 2023 +0000" }, "message": "Merge changes from topic \"ipsec-tramsform-state\" into main\n\n* changes:\n Expose APIs to query the state of an IpSecTransform\n Reland \"Support getting transform state in IpSecService\"\n" }, { "commit": "d1625679fba0b54b74ac95aa9adf9df60996df76", "tree": "4ecabe45a4860f04360ec46c25ad9a11cece2cbc", "parents": [ "f83d4df182c853b1718e22ba8ee3b8201f49d8e6" ], "author": { "name": "Xinyi Zhou", "email": "zxy@google.com", "time": "Tue Dec 12 19:53:40 2023 +0000" }, "committer": { "name": "Xinyi Zhou", "email": "zxy@google.com", "time": "Wed Dec 13 05:48:48 2023 +0000" }, "message": "Exclude user build devices for the test\n\nFix: 313884732\nIgnore-AOSP-First: nearby_not_in_aosp_yet\nTest: -m\n(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:523eeb3c87bd8f6d353d439120545566f94aaf4c)\nMerged-In: Iaaca422cb105c00ded1d84b40afd745abcd651b7\nChange-Id: Iaaca422cb105c00ded1d84b40afd745abcd651b7\n" }, { "commit": "f83d4df182c853b1718e22ba8ee3b8201f49d8e6", "tree": "50e664a059cb54420728dfebe780ecd32071587f", "parents": [ "11234fe8c1a8cb5296b46df5f4e441cf65de955e" ], "author": { "name": "Xinyi Zhou", "email": "zxy@google.com", "time": "Tue Dec 12 19:53:31 2023 +0000" }, "committer": { "name": "Xinyi Zhou", "email": "zxy@google.com", "time": "Wed Dec 13 05:46:26 2023 +0000" }, "message": "[nearby] Add nearby_enable_ble_in_init flag\n\nBug: 312430336\nIgnore-AOSP-First: nearby_not_in_aosp_yet\nTest: -m\n(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:fc084ea87ce18275c788c21ba9018636dfdff5e0)\nMerged-In: I5bafa8a85d4f2169fcdef73e2d9f21534553ff72\nChange-Id: I5bafa8a85d4f2169fcdef73e2d9f21534553ff72\n" }, { "commit": "11234fe8c1a8cb5296b46df5f4e441cf65de955e", "tree": "a30e97904e6c7cf54cc2e852cadedb499224182b", "parents": [ "164969d6002957cd9c23545bb4a358adb6dd51b6" ], "author": { "name": "Xinyi Zhou", "email": "zxy@google.com", "time": "Tue Dec 12 19:53:21 2023 +0000" }, "committer": { "name": "Xinyi Zhou", "email": "zxy@google.com", "time": "Wed Dec 13 05:40:04 2023 +0000" }, "message": "Revert \"[nearby] Add disable logic\"\n\nThis reverts commit 3f5aea69f9f36097b407822b0cc177c0df51f061.\n\nReason for revert: Caused crash\n\nFix: 312430336\n(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:4ed63b1873841a37f3ebbef5ff5072a253fa6186)\nMerged-In: Id664a6cba297674d8edeb0af700df1e96baaf70e\nChange-Id: Id664a6cba297674d8edeb0af700df1e96baaf70e\n" }, { "commit": "9efc429906420b95a30708e45c4464a7738fe240", "tree": "b598f45f32da1afec364b2661bf084dbf9fcdd9b", "parents": [ "bf96d948203957cb93d89e4f812d1d120d41c440", "22941b38f7708b368cdbdeef40e33112080a8ab6" ], "author": { "name": "Lorenzo Colitti", "email": "lorenzo@google.com", "time": "Wed Dec 13 05:35:32 2023 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Wed Dec 13 05:35:32 2023 +0000" }, "message": "Merge \"Don\u0027t add LOCAL_NETWORK as forbidden capability\" into main" }, { "commit": "164969d6002957cd9c23545bb4a358adb6dd51b6", "tree": "475b8371c4df442497f37285146ffea4b29c6ea8", "parents": [ "4dfc0895316272fe3cbb64fe65495bfda4dd7f26" ], "author": { "name": "Xinyi Zhou", "email": "zxy@google.com", "time": "Tue Dec 12 19:53:12 2023 +0000" }, "committer": { "name": "Xinyi Zhou", "email": "zxy@google.com", "time": "Wed Dec 13 05:32:21 2023 +0000" }, "message": "[nearby] Add disable logic\n\nAlso moves enableBLE logic from init to when there is at least one\nclient\n\nTest: -m\nBug: 294906731\nIgnore-AOSP-First: nearby_not_in_aosp_yet\n(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:3f5aea69f9f36097b407822b0cc177c0df51f061)\nMerged-In: I24ca7581d60afee484d14f66a411344ce132425a\nChange-Id: I24ca7581d60afee484d14f66a411344ce132425a\n" }, { "commit": "4dfc0895316272fe3cbb64fe65495bfda4dd7f26", "tree": "a30e97904e6c7cf54cc2e852cadedb499224182b", "parents": [ "64e14583cc7f4c0e5e2d7f8c3cde32a1130dc9bc" ], "author": { "name": "Xinyi Zhou", "email": "zxy@google.com", "time": "Tue Dec 12 19:53:05 2023 +0000" }, "committer": { "name": "Xinyi Zhou", "email": "zxy@google.com", "time": "Wed Dec 13 05:28:33 2023 +0000" }, "message": "[nearby] Log changes\n\nTest: -m\nIgnore-AOSP-First: nearby_not_in_aosp_yet\n(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:2a4cadec922725cf89992103f6ade337d5a8ec86)\nMerged-In: I11a03bd3bf40cd7cd6f0ac892f040c9eb3ce822c\nChange-Id: I11a03bd3bf40cd7cd6f0ac892f040c9eb3ce822c\n" }, { "commit": "64e14583cc7f4c0e5e2d7f8c3cde32a1130dc9bc", "tree": "bab9254f151d2acfefb3d947463bf954ee2c5da6", "parents": [ "6fca26676aa6e650ab5b87458d40821c5f9bdeda" ], "author": { "name": "Xinyi Zhou", "email": "zxy@google.com", "time": "Tue Dec 12 19:52:56 2023 +0000" }, "committer": { "name": "Xinyi Zhou", "email": "zxy@google.com", "time": "Wed Dec 13 05:27:57 2023 +0000" }, "message": "[nearby] Sync discoveryTimestamp field name\n\nTest: -m\nBug: 306043245\nIgnore-AOSP-First: nearby_not_in_aosp_yet\n(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:d6acb0655f4fa619bd0ff7a6e7a1a76959db29d9)\nMerged-In: I96e03660dbd49f361a436276d62473504f88d657\nChange-Id: I96e03660dbd49f361a436276d62473504f88d657\n" }, { "commit": "6fca26676aa6e650ab5b87458d40821c5f9bdeda", "tree": "6ff0f13e91ef78b56595472fbcfc7fd5a7cc1b40", "parents": [ "d145497f3145d9cd1033fcd59a8eb554f38fda33" ], "author": { "name": "Xinyi Zhou", "email": "zxy@google.com", "time": "Tue Dec 12 19:52:48 2023 +0000" }, "committer": { "name": "Xinyi Zhou", "email": "zxy@google.com", "time": "Wed Dec 13 05:22:59 2023 +0000" }, "message": "[nearby] Enable BLE when init\n\nFix: 294906731\nTest: -m\nIgnore-AOSP-First: nearby_not_in_aosp_yet\n(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:2a9323b184edda09184d5d94c32ca5dfaedf2690)\nMerged-In: Ie380efbc452af51691daa1e96e04dd575801c3a9\nChange-Id: Ie380efbc452af51691daa1e96e04dd575801c3a9\n" }, { "commit": "d145497f3145d9cd1033fcd59a8eb554f38fda33", "tree": "4f9b4886f6264ce198aa4aec66cf7d0ed2523b3a", "parents": [ "a34d7e89495670bd999fc8a5f5c7fc61e92a2497" ], "author": { "name": "Xinyi Zhou", "email": "zxy@google.com", "time": "Tue Dec 12 19:52:38 2023 +0000" }, "committer": { "name": "Xinyi Zhou", "email": "zxy@google.com", "time": "Wed Dec 13 05:22:31 2023 +0000" }, "message": "[nearby] Add logs to broadcaster\n\nTest: -m\nIgnore-AOSP-First: nearby_not_in_aosp_yet\n(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:85f260c4dd7503978f2c6e83a7eadadc8e9b73a7)\nMerged-In: I9fd0009d21ac5193a2e7b715067c4956902cd2db\nChange-Id: I9fd0009d21ac5193a2e7b715067c4956902cd2db\n" }, { "commit": "a34d7e89495670bd999fc8a5f5c7fc61e92a2497", "tree": "40cefaf2737bfd71209ac5b8ac4688a8ba85d56c", "parents": [ "df7db9c554c344f55f8dbb8393f3a091630bfc00" ], "author": { "name": "Xinyi Zhou", "email": "zxy@google.com", "time": "Tue Dec 12 19:52:31 2023 +0000" }, "committer": { "name": "Xinyi Zhou", "email": "zxy@google.com", "time": "Wed Dec 13 05:21:55 2023 +0000" }, "message": "[nearby] Add discoveryTimestamp field\n\nTest: -m\nBug: 306043245\nIgnore-AOSP-First: nearby_not_in_aosp_yet\n(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:730894831d541ef67063e1d85e3b770476053fe6)\nMerged-In: I2151cdeceec1a3180c79b0ea10adb6e5581f4845\nChange-Id: I2151cdeceec1a3180c79b0ea10adb6e5581f4845\n" }, { "commit": "df7db9c554c344f55f8dbb8393f3a091630bfc00", "tree": "d4a33b3200ca985ba8eb8b0b694845d96a3dcb66", "parents": [ "64cbadfad94d247d670b96913d0cbd3215491011" ], "author": { "name": "Xinyi Zhou", "email": "zxy@google.com", "time": "Tue Dec 12 19:52:09 2023 +0000" }, "committer": { "name": "Android Build Cherrypicker Worker", "email": "android-build-cherrypicker-worker@google.com", "time": "Wed Dec 13 05:18:14 2023 +0000" }, "message": "[nearby] Fix flakeness in the unit test\n\nTest: -m\nIgnore-AOSP-First: nearby not in aosp yet\nFix: 302599461\n(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:08356f82527aad27dc9613f3e406f7732b363e42)\nMerged-In: Id438f453893e4e4adbd341ba36c4a0e3d3dbcb4f\nChange-Id: Id438f453893e4e4adbd341ba36c4a0e3d3dbcb4f\n" }, { "commit": "64cbadfad94d247d670b96913d0cbd3215491011", "tree": "703f524c5b0ab71f817587e6861cf7dd39c729b6", "parents": [ "d9da74a98ea3a1206066c16f4d6ef03e6d1c5cba" ], "author": { "name": "Xinyi Zhou", "email": "zxy@google.com", "time": "Tue Dec 12 19:52:00 2023 +0000" }, "committer": { "name": "Android Build Cherrypicker Worker", "email": "android-build-cherrypicker-worker@google.com", "time": "Wed Dec 13 05:17:44 2023 +0000" }, "message": "[nearby][clean up] Remove useless legacy code\n\nThis was used back when Bluetooth 4.2 was used. We should remove the\nempty code here.\n\nTest: -m\nIgnore-AOSP-First: nearby not in aosp yet\n(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:d671163a9a5d5d6cb8392fad08143c81b8ad5e0b)\nMerged-In: I0ea54f77c66c01f02fbee9eb1e782a3a9ade6566\nChange-Id: I0ea54f77c66c01f02fbee9eb1e782a3a9ade6566\n" }, { "commit": "d9da74a98ea3a1206066c16f4d6ef03e6d1c5cba", "tree": "41ca083645b491cedfe061cbfff9089821a0e962", "parents": [ "e899d26468e9e0f3f53f05f670c8c410ad59b8cd" ], "author": { "name": "Xinyi Zhou", "email": "zxy@google.com", "time": "Thu Sep 14 15:48:54 2023 -0700" }, "committer": { "name": "Android Build Cherrypicker Worker", "email": "android-build-cherrypicker-worker@google.com", "time": "Wed Dec 13 02:51:17 2023 +0000" }, "message": "[nearby] Fix the user-debug only test\n\nTest: -m\nFix: 273887455\nIgnore-AOSP-First: aosp first on Oct\n(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:0f192c89c541536ba45a243b2a21815c7dc4d0bf)\nMerged-In: I7644a8187c36c944b36f1b4eb741edf46d9b1ad2\nChange-Id: I7644a8187c36c944b36f1b4eb741edf46d9b1ad2\n" }, { "commit": "22941b38f7708b368cdbdeef40e33112080a8ab6", "tree": "b9ba1766c2640b54a35a255f9187409187f0d2ec", "parents": [ "dbae5744a14125a3fc61f0a9b586a6af189db684" ], "author": { "name": "Lorenzo Colitti", "email": "lorenzo@google.com", "time": "Wed Dec 13 01:40:20 2023 +0000" }, "committer": { "name": "Remi NGUYEN VAN", "email": "reminv@google.com", "time": "Wed Dec 13 11:24:25 2023 +0900" }, "message": "Don\u0027t add LOCAL_NETWORK as forbidden capability\n\nThis causes the module to crash on rollback because the current\nproduction code does not consider LOCAL_NETWORK to be a valid\ncapability.\n\nChange-Id: Idf57d72c384b41b483098c4c302738072ebf7f90\nTest: TH\nFix: 313030307\n" }, { "commit": "e899d26468e9e0f3f53f05f670c8c410ad59b8cd", "tree": "5a84aafd7f0efa938b7bdeff938b50464bc53c82", "parents": [ "a3eb71b63362d554571702dff07424bc2e871d34" ], "author": { "name": "Xinyi Zhou", "email": "zxy@google.com", "time": "Mon Sep 11 15:38:52 2023 -0700" }, "committer": { "name": "Android Build Cherrypicker Worker", "email": "android-build-cherrypicker-worker@google.com", "time": "Wed Dec 13 02:21:17 2023 +0000" }, "message": "[nearby] Catches NPE in ChreDiscoveryProvider\n\nTest: -m\nIgnore-AOSP-First: neary not in aosp yet\nFix: 298597342\n(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:5d07eee4c1671a3d1d6b6669c338d098cfe488f9)\nMerged-In: I1ef411aea6db6d0c169aa08c303f4234c77baed9\nChange-Id: I1ef411aea6db6d0c169aa08c303f4234c77baed9\n" }, { "commit": "a3eb71b63362d554571702dff07424bc2e871d34", "tree": "405d55ea660a319883e87af69af739e154049e28", "parents": [ "bf96d948203957cb93d89e4f812d1d120d41c440" ], "author": { "name": "Xinyi Zhou", "email": "zxy@google.com", "time": "Tue Aug 15 15:47:05 2023 -0700" }, "committer": { "name": "Android Build Cherrypicker Worker", "email": "android-build-cherrypicker-worker@google.com", "time": "Wed Dec 13 00:46:31 2023 +0000" }, "message": "[nearby] Update README to add build env script\n\nTest: n/a\nIgnore-AOSP-First: nearby_not_in_aosp_yet\n(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:85afaab1ac308f12d7263ef4b8a2b1ba6a3a2f13)\nMerged-In: I43257c79d212ed24fb0cd69f363b25bceb098f01\nChange-Id: I43257c79d212ed24fb0cd69f363b25bceb098f01\n" }, { "commit": "3976e49e400cd7f0c061af8b74068cbf0c538bcf", "tree": "8994c8080d25e9a6581db1e36cc051a6dfce864c", "parents": [ "84fc0ee2d643aacc3825c0eca24a02f6fe8a4d60" ], "author": { "name": "Yan Yan", "email": "evitayan@google.com", "time": "Wed Nov 15 23:53:33 2023 +0000" }, "committer": { "name": "Yan Yan", "email": "evitayan@google.com", "time": "Tue Dec 12 22:20:53 2023 +0000" }, "message": "Expose APIs to query the state of an IpSecTransform\n\nBug: 308011229\nTest: make update-api\nChange-Id: I5ca6278305f814dbce6a7c41a4f4e491b1389b31\n" }, { "commit": "84fc0ee2d643aacc3825c0eca24a02f6fe8a4d60", "tree": "8ab4e38a89f4c64fb26974584d3abf394e11d706", "parents": [ "69eb8325c0c403e28fb938112a3077d381207a8e" ], "author": { "name": "Yan Yan", "email": "evitayan@google.com", "time": "Tue Dec 12 22:19:55 2023 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Tue Dec 12 22:19:55 2023 +0000" }, "message": "Reland \"Support getting transform state in IpSecService\"\n\nThis reverts commit 69eb8325c0c403e28fb938112a3077d381207a8e.\n\nBug: 308011229\nChange-Id: I4dd68bdedc0088860895a833f2b4cb8e1845429a\nTest: IpSecServiceParameterizedTest (new tests)\n" }, { "commit": "bf96d948203957cb93d89e4f812d1d120d41c440", "tree": "af65ec3c46ec3590954b294c6105332d332d2644", "parents": [ "7a2152a0aa58bf396f44cd864d47f5bb749e477a", "69eb8325c0c403e28fb938112a3077d381207a8e" ], "author": { "name": "Yan Yan", "email": "evitayan@google.com", "time": "Tue Dec 12 22:05:19 2023 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Tue Dec 12 22:05:19 2023 +0000" }, "message": "Merge \"Revert \"Support getting transform state in IpSecService\"\" into main" }, { "commit": "69eb8325c0c403e28fb938112a3077d381207a8e", "tree": "74c0c3b2311d259a3ddeef8049904a94b6b2385d", "parents": [ "ab5006c17d417570b386d46e369916ea3be1d0c1" ], "author": { "name": "Yan Yan", "email": "evitayan@google.com", "time": "Tue Dec 12 21:53:46 2023 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Tue Dec 12 21:53:46 2023 +0000" }, "message": "Revert \"Support getting transform state in IpSecService\"\n\nThis reverts commit ab5006c17d417570b386d46e369916ea3be1d0c1.\n\nReason for revert: b/316010034 breaking VCN unit tests\n\nChange-Id: I68cb1a99bb6e492c16901972d201761cd00df6fa\n" }, { "commit": "7a2152a0aa58bf396f44cd864d47f5bb749e477a", "tree": "72cc607d0e263097884ece5c2890521adc33e077", "parents": [ "abf9dcebdd06131afbb184cccf99919316299445", "bcf305cbef1b3dd6b9def93eb275fff2f458297a" ], "author": { "name": "Xinyi Zhou", "email": "zxy@google.com", "time": "Tue Dec 12 19:47:35 2023 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Tue Dec 12 19:47:35 2023 +0000" }, "message": "Merge changes from topic \"v1_impl_cherrypick\" into main\n\n* changes:\n [nearby] Update encoding and decoding according to the spec\n [nearby] Update encryption methods according to the spec\n" }, { "commit": "abf9dcebdd06131afbb184cccf99919316299445", "tree": "8c94d8f293e2446c18b9f38ceda069dae49d98c6", "parents": [ "336f3c10847bb280dd1bee01479f4aee8a6a7983", "ab5006c17d417570b386d46e369916ea3be1d0c1" ], "author": { "name": "Yan Yan", "email": "evitayan@google.com", "time": "Tue Dec 12 18:23:47 2023 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Tue Dec 12 18:23:47 2023 +0000" }, "message": "Merge \"Support getting transform state in IpSecService\" into main" }, { "commit": "336f3c10847bb280dd1bee01479f4aee8a6a7983", "tree": "b454dbf29dcf822239778063d8a88c07340be89b", "parents": [ "d0535553c693ce21c0fb59259a1bd60857bea579", "9ea3be13fcbe563d244cc5f7d82a9d64dcebc1f0" ], "author": { "name": "Yang Sun", "email": "sunytt@google.com", "time": "Tue Dec 12 12:46:55 2023 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Tue Dec 12 12:46:55 2023 +0000" }, "message": "Merge changes I395560fb,If6abc33c into main\n\n* changes:\n Add support for NLM_F_DUMP request in StructNLMsgHdr\n Mark NetworkStaticLibTestsLib as test for lint\n" }, { "commit": "d0535553c693ce21c0fb59259a1bd60857bea579", "tree": "25074a92e2e9bad439bfe919d146c71b973e4878", "parents": [ "dbae5744a14125a3fc61f0a9b586a6af189db684" ], "author": { "name": "Chiachang Wang", "email": "chiachangwang@google.com", "time": "Tue Dec 12 06:39:10 2023 +0000" }, "committer": { "name": "Chiachang Wang", "email": "chiachangwang@google.com", "time": "Tue Dec 12 06:44:29 2023 +0000" }, "message": "Add more timeout for verify the interaction of the mock object\n\nThe verification happened earlier than the interaction with\nproduction code. This may happen in low performance devices,\ne.g. cuttlefish. Add timeout for the verification to deflake\nthe test.\n\nBug: 313828402\nTest: atest FrameworksNetTests\nChange-Id: I1ffa7e7573d503eb0396aa211a90ba032175b3a1\n" }, { "commit": "dbae5744a14125a3fc61f0a9b586a6af189db684", "tree": "88374c3b702a6d05c8dadb80359efc9385bd254f", "parents": [ "d7a9a654f796a33fa26342a9877b6c74a7cff137", "cf11be9eb2c7b727594ff515c8e2584cdca854ba" ], "author": { "name": "Mark Chien", "email": "markchien@google.com", "time": "Tue Dec 12 05:14:51 2023 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Tue Dec 12 05:14:51 2023 +0000" }, "message": "Merge \"Add experiment flag for tethering refactor\" into main" }, { "commit": "cf11be9eb2c7b727594ff515c8e2584cdca854ba", "tree": "92277491ab526b0659fd18d90dac4391f34e061d", "parents": [ "ef41398c1f6534b3c4d812582b9bcf2594c739b0" ], "author": { "name": "Mark", "email": "markchien@google.com", "time": "Tue Dec 05 08:19:15 2023 +0000" }, "committer": { "name": "Mark", "email": "markchien@google.com", "time": "Tue Dec 12 02:31:54 2023 +0000" }, "message": "Add experiment flag for tethering refactor\n\nThe logic is currently disabled by default, adding a flag so\nthat we can compare result with A/B rollout.\n\nTest: atest TetheringTests\nChange-Id: If640b9a172b97aa67c49b2976cdef118218f1e0f\n" }, { "commit": "bcf305cbef1b3dd6b9def93eb275fff2f458297a", "tree": "366761d242f98e73df3c6144fcfd07cde856f58b", "parents": [ "f31eccbdbb6c3e4ac2cf90a1a683128d037be360" ], "author": { "name": "Xinyi Zhou", "email": "zxy@google.com", "time": "Tue Aug 01 13:44:54 2023 -0700" }, "committer": { "name": "Xinyi Zhou", "email": "zxy@google.com", "time": "Tue Dec 12 01:21:15 2023 +0000" }, "message": "[nearby] Update encoding and decoding according to the spec\n\nTest: w/ MainlineTestApp\nFix: 290294482\nIgnore-AOSP-First: nearby_not_in_aosp_yet\n(cherry picked from https://googleplex-android-review.googlesource.com/q/17a0803df0c82377ed4afda50c24d59b4a814002)\nMerged-In: Ie50d3fae62af6f637583216e3dae5841c1214aa3\nChange-Id: Ie50d3fae62af6f637583216e3dae5841c1214aa3\n" }, { "commit": "f31eccbdbb6c3e4ac2cf90a1a683128d037be360", "tree": "56a4da85ff0f94c4c1f735dc9998238176d70f61", "parents": [ "d7a9a654f796a33fa26342a9877b6c74a7cff137" ], "author": { "name": "Xinyi Zhou", "email": "zxy@google.com", "time": "Mon Jul 31 15:58:17 2023 -0700" }, "committer": { "name": "Xinyi Zhou", "email": "zxy@google.com", "time": "Mon Dec 11 16:17:25 2023 -0800" }, "message": "[nearby] Update encryption methods according to the spec\n\nTest: -m\nFix: 290294425\nIgnore-AOSP-First: nearby_not_in_aosp_yet\n(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:297c193dede82ca662a708bb7f3eeb90ce9e968b)\nMerged-In: I24ead1adfd0928a877fa1441501c3b6e462bdbd6\nChange-Id: I24ead1adfd0928a877fa1441501c3b6e462bdbd6\n" }, { "commit": "ab5006c17d417570b386d46e369916ea3be1d0c1", "tree": "8ab4e38a89f4c64fb26974584d3abf394e11d706", "parents": [ "d7a9a654f796a33fa26342a9877b6c74a7cff137" ], "author": { "name": "Yan Yan", "email": "evitayan@google.com", "time": "Wed Nov 15 21:41:51 2023 +0000" }, "committer": { "name": "Yan Yan", "email": "evitayan@google.com", "time": "Tue Dec 12 00:14:13 2023 +0000" }, "message": "Support getting transform state in IpSecService\n\nBug: 308011229\nTest: IpSecServiceParameterizedTest (new tests)\nChange-Id: I3f1c2ef60ee9b6ac17909e0ee083ee6f8483588e\n" }, { "commit": "d7a9a654f796a33fa26342a9877b6c74a7cff137", "tree": "74c0c3b2311d259a3ddeef8049904a94b6b2385d", "parents": [ "96db51b37738f73603f69215ff26b7e913fc99c4", "8fff1dbd0d2a41c765c218a2b0e60a5b58d876be" ], "author": { "name": "Xinyi Zhou", "email": "zxy@google.com", "time": "Mon Dec 11 23:47:47 2023 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Mon Dec 11 23:47:47 2023 +0000" }, "message": "Merge changes from topic \"cherrypicker-L94400030000731002:N23400030012047507\" into main\n\n* changes:\n [nearby] Returns error code for startBroadcast if there is an existing broadcast\n [nearby] Update README\n [nearby] Unregister broadcast listener in death\n [nearby] Add CredentialElement class\n [nearby][framework] Sync DataElement value with spec\n Fix NearbyConfigurationTest.\n Catches illegal argument exception thrown by LE advertiser\n" }, { "commit": "96db51b37738f73603f69215ff26b7e913fc99c4", "tree": "3d3e1729677ec44ae0bbbba9edc30da16ca66e2f", "parents": [ "6de75676465fb46b4d0b0cb13995d75cccfa7ea4", "4df361975d13e274a32e0568b97d74c34a1a4528" ], "author": { "name": "Yan Yan", "email": "evitayan@google.com", "time": "Mon Dec 11 23:27:17 2023 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Mon Dec 11 23:27:17 2023 +0000" }, "message": "Merge \"[XFRM_MSG_NEWSA] Support polling SA state with netlink message\" into main" }, { "commit": "6de75676465fb46b4d0b0cb13995d75cccfa7ea4", "tree": "ac0bd05d7ceee0ee927d6683c3c4691f4860ad5a", "parents": [ "5ad399d8c3f7ce16018f0487b3f41a9cb6a4782b", "4ae120de048748d779bae764d2f58775f61b7557" ], "author": { "name": "Xinyi Zhou", "email": "zxy@google.com", "time": "Mon Dec 11 22:10:25 2023 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Mon Dec 11 22:10:25 2023 +0000" }, "message": "Merge \"Removes duplicated filter setting\" into main" }, { "commit": "4df361975d13e274a32e0568b97d74c34a1a4528", "tree": "b36f56c4f3292ee94a79bdc69ece12138e92ba3a", "parents": [ "b94bd28e330e440f5fc6d57521f29fecd6004e30" ], "author": { "name": "Yan Yan", "email": "evitayan@google.com", "time": "Wed Nov 15 19:44:05 2023 +0000" }, "committer": { "name": "Yan Yan", "email": "evitayan@google.com", "time": "Mon Dec 11 18:43:34 2023 +0000" }, "message": "[XFRM_MSG_NEWSA] Support polling SA state with netlink message\n\nBug: 308011229\nTest: IpSecXfrmControllerTest\nChange-Id: Id765cd8d8d7e330969877cb0890bd828417fb6b8\n" }, { "commit": "5ad399d8c3f7ce16018f0487b3f41a9cb6a4782b", "tree": "ac0bd05d7ceee0ee927d6683c3c4691f4860ad5a", "parents": [ "925258121caec0d3fd52cd72ba71b6290d69b0b3", "38c7503ab5358256ef2e315e178b14b7409f513c" ], "author": { "name": "Junyu Lai", "email": "junyulai@google.com", "time": "Mon Dec 11 10:09:57 2023 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Mon Dec 11 10:09:57 2023 +0000" }, "message": "Merge \"[BR14] Tracker Data Saver status in ConnectivityService\" into main" }, { "commit": "b17d60144a61eecd9f5667626fba0e9550045dec", "tree": "8282eace59063a1377513daae8dd9e7390f847a5", "parents": [ "925258121caec0d3fd52cd72ba71b6290d69b0b3" ], "author": { "name": "Motomu Utsumi", "email": "motomuman@google.com", "time": "Mon Dec 11 14:58:03 2023 +0900" }, "committer": { "name": "Motomu Utsumi", "email": "motomuman@google.com", "time": "Mon Dec 11 15:12:01 2023 +0900" }, "message": "Remove TrunkStable.bp\n\nAconfig Flag for android network is defined in the platform and\nTrunkStable.bp is not used.\n\nTest: TH\nBug: 315302281\nChange-Id: I46d988f25a366e51da52af01ad34e2ce1511c942\n" }, { "commit": "925258121caec0d3fd52cd72ba71b6290d69b0b3", "tree": "872ff9bafa1e80bc04fd2dc1c99b71733b203186", "parents": [ "373b03fbf37e45489f5fd0d8c5b1ed9ae8d0efb4", "31abe92c3675bbe6e597d191f9662c1196b3ca55" ], "author": { "name": "Motomu Utsumi", "email": "motomuman@google.com", "time": "Sun Dec 10 12:28:35 2023 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Sun Dec 10 12:28:35 2023 +0000" }, "message": "Merge \"Use flags.aconfig in platform for android networking\" into main" }, { "commit": "9ea3be13fcbe563d244cc5f7d82a9d64dcebc1f0", "tree": "870d08464808271ef9c89bed62c2a89d66f9d697", "parents": [ "d5c0276b342cc12337d45788a8b91e135f61b878" ], "author": { "name": "Yang Sun", "email": "sunytt@google.com", "time": "Wed Dec 06 19:40:51 2023 +0800" }, "committer": { "name": "Yang Sun", "email": "sunytt@google.com", "time": "Sat Dec 09 20:03:43 2023 +0800" }, "message": "Add support for NLM_F_DUMP request in StructNLMsgHdr\n\nTest: atest NetworkStaticLibTests:com.android.net.moduletests.util.netlink.StructNlMsgHdrTest\nChange-Id: I395560fb1edfb1c806b2ed4c74a7a3081c7b2515\n" }, { "commit": "8fff1dbd0d2a41c765c218a2b0e60a5b58d876be", "tree": "c35e6f334f555c7633d0f732d466bca2b5945744", "parents": [ "b1efe80d75f6e03c79dbecdff1d2488d47398961" ], "author": { "name": "Xinyi Zhou", "email": "zxy@google.com", "time": "Mon Aug 07 17:32:36 2023 -0700" }, "committer": { "name": "Android Build Cherrypicker Worker", "email": "android-build-cherrypicker-worker@google.com", "time": "Fri Dec 08 22:37:18 2023 +0000" }, "message": "[nearby] Returns error code for startBroadcast if there is an existing broadcast\n\nFix: 294461081\nTest: -m\nIgnore-AOSP-First: nearby_not_in_aosp_yet\n(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:7b40aa36e8419e134c8171e22a7fa2a2d3bf85a7)\nMerged-In: Icc3227ec5aa7d0ea7d33b7100ef131928577b5a7\nChange-Id: Icc3227ec5aa7d0ea7d33b7100ef131928577b5a7\n" }, { "commit": "b1efe80d75f6e03c79dbecdff1d2488d47398961", "tree": "bd71afe968f91955e5c4e9e0fdbea85726438b6d", "parents": [ "743ca81c30bc76be18509940bc4164c0c7eb641b" ], "author": { "name": "Xinyi Zhou", "email": "zxy@google.com", "time": "Tue Aug 01 15:12:55 2023 -0700" }, "committer": { "name": "Android Build Cherrypicker Worker", "email": "android-build-cherrypicker-worker@google.com", "time": "Fri Dec 08 22:37:13 2023 +0000" }, "message": "[nearby] Update README\n\nTest: n/a\nIgnore-AOSP-First: nearby_not_in_aosp_yet\n(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:99c18f649c9a2623c905f9cbfea04a2559756050)\nMerged-In: I0802e60f60170b3be686fa7b16aeb6a2571a7386\nChange-Id: I0802e60f60170b3be686fa7b16aeb6a2571a7386\n" }, { "commit": "743ca81c30bc76be18509940bc4164c0c7eb641b", "tree": "4487366e8ca6a84c43f552cbb8f091519f920c74", "parents": [ "8cd2e81dfdcb6519b9084c29df3ed9ca75c39594" ], "author": { "name": "Xinyi Zhou", "email": "zxy@google.com", "time": "Tue Jul 18 16:13:55 2023 -0700" }, "committer": { "name": "Android Build Cherrypicker Worker", "email": "android-build-cherrypicker-worker@google.com", "time": "Fri Dec 08 22:37:07 2023 +0000" }, "message": "[nearby] Unregister broadcast listener in death\n\nFix: 280377682\nTest: unit test\nIgnore-AOSP-First: nearby_not_in_aosp_yet\n(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:691adc8cdd1cca9077740ce06246ce347867d757)\nMerged-In: I1d632cb150ae30808cbf3343869534111e3dde12\nChange-Id: I1d632cb150ae30808cbf3343869534111e3dde12\n" }, { "commit": "8cd2e81dfdcb6519b9084c29df3ed9ca75c39594", "tree": "0953ca6cb1c4fa737212f148d80b7ab1272c293b", "parents": [ "947c01ddc601ab40c2baf560e6988aa09cef4586" ], "author": { "name": "Xinyi Zhou", "email": "zxy@google.com", "time": "Fri Jul 07 16:16:41 2023 -0700" }, "committer": { "name": "Android Build Cherrypicker Worker", "email": "android-build-cherrypicker-worker@google.com", "time": "Fri Dec 08 22:37:03 2023 +0000" }, "message": "[nearby] Add CredentialElement class\n\nThis class should extend DataElement ideally, but we cannot do this\nsince the DataElement class as System API is final.\n\nBug: 290294482\nTest: unit test\nIgnore-AOSP-First: nearby_not_in_aosp_yet\n(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:0e9e44c4f06c6ea58e991b695cb34dbc0c9d3b59)\nMerged-In: I2ec80b5975a8fb27edb5f92f134d6076738eaac8\nChange-Id: I2ec80b5975a8fb27edb5f92f134d6076738eaac8\n" }, { "commit": "947c01ddc601ab40c2baf560e6988aa09cef4586", "tree": "7889c826442da8e679e1205ca074d1a5b832174d", "parents": [ "c3c807b54b0336c5b53a7c3b6960470e6d7e9fd9" ], "author": { "name": "Xinyi Zhou", "email": "zxy@google.com", "time": "Wed Jul 05 15:37:16 2023 -0700" }, "committer": { "name": "Android Build Cherrypicker Worker", "email": "android-build-cherrypicker-worker@google.com", "time": "Fri Dec 08 22:36:58 2023 +0000" }, "message": "[nearby][framework] Sync DataElement value with spec\n\nNote DataType in DataElement is used for internal implementation only.\nWe only keep those data element types used for encoding and decoding.\nPlease use the spec as the only source.\n\ngo/nearby-specs-working-doc\n\nBug: 234155151\nTest: -m\nIgnore-AOSP-First: nearby_not_in_aosp_yet\n(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:8182ac22c14e044c5161483a9a96bf594c403e61)\nMerged-In: I71754e645742ca4fe20d346763796a1a5e5dae75\nChange-Id: I71754e645742ca4fe20d346763796a1a5e5dae75\n" }, { "commit": "c3c807b54b0336c5b53a7c3b6960470e6d7e9fd9", "tree": "6b88256767853b0d4d6e4f0e1598f17309f81d76", "parents": [ "a60ebedf584ec5c392b075171fd72521c058852d" ], "author": { "name": "Chen Wang", "email": "chenw@google.com", "time": "Mon Jun 26 18:53:45 2023 +0000" }, "committer": { "name": "Android Build Cherrypicker Worker", "email": "android-build-cherrypicker-worker@google.com", "time": "Fri Dec 08 22:36:53 2023 +0000" }, "message": "Fix NearbyConfigurationTest.\n\nTestAppSupported Flag can be set to true only in user-debug devices.\nAdd conidtional testing for this test case.\n\nBug: 285234065\nIgnore-AOSP-First: nearby_not_in_aosp_yet\nTest: atest NearbyConfigurationTest\n(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:22b1e80835ec5bbacc7cb3bf88e072cfd8fcd8d9)\nMerged-In: I14a7947f8a9178a1f97b5ed392882ab9f200eb89\nChange-Id: I14a7947f8a9178a1f97b5ed392882ab9f200eb89\n" }, { "commit": "a60ebedf584ec5c392b075171fd72521c058852d", "tree": "7f2af076a29b31128b7a2a31c3dee6f77a6ab4ad", "parents": [ "742c476d8966ec8fb0bce3eec0e1956d609c6749" ], "author": { "name": "Jayden Kim", "email": "jaydenk@google.com", "time": "Tue Jun 27 03:51:37 2023 +0000" }, "committer": { "name": "Android Build Cherrypicker Worker", "email": "android-build-cherrypicker-worker@google.com", "time": "Fri Dec 08 22:36:47 2023 +0000" }, "message": "Catches illegal argument exception thrown by LE advertiser\n\nTest: on device test\nIgnore-AOSP-First: nearby_not_in_aosp_yet\nBug: 280387586\n(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:b1c6f7f6de1826c004ddc4ca69eb77d7416b0660)\nMerged-In: Ie05ed9ff57743f0e91ec0571d5a99bebd55a56c8\nChange-Id: Ie05ed9ff57743f0e91ec0571d5a99bebd55a56c8\n" }, { "commit": "4ae120de048748d779bae764d2f58775f61b7557", "tree": "b731b3640cf0d921169696c8218b3f8a6ec818ce", "parents": [ "742c476d8966ec8fb0bce3eec0e1956d609c6749" ], "author": { "name": "Jayden Kim", "email": "jaydenk@google.com", "time": "Fri Jun 16 03:52:16 2023 +0000" }, "committer": { "name": "Android Build Cherrypicker Worker", "email": "android-build-cherrypicker-worker@google.com", "time": "Fri Dec 08 22:31:42 2023 +0000" }, "message": "Removes duplicated filter setting\n\nTest: on device test\nIgnore-AOSP-First: nearby_not_in_aosp_yet\nBug: 287538344\n(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:7ed8dd6ac3479e19dd8c935bb356a2ecf2d7623f)\nMerged-In: Idbf2918bae00b31ebb31f3f09590e32b4eb0ebc2\nChange-Id: Idbf2918bae00b31ebb31f3f09590e32b4eb0ebc2\n" }, { "commit": "373b03fbf37e45489f5fd0d8c5b1ed9ae8d0efb4", "tree": "b13b10b97902e5b2c1c65d00a565a039e828047e", "parents": [ "742c476d8966ec8fb0bce3eec0e1956d609c6749", "1c2937d51a8873561b605173640e19726cf6d38d" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Dec 08 13:14:25 2023 -0800" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Dec 08 13:14:25 2023 -0800" }, "message": "Merge Android 14 QPR1\n\nMerged-In: I08c79f7266116cfe8d6b0ed42a6f026547660cbc\nBug: 315507370\nChange-Id: Id924654831ef1b5024d4329477d497783165426b\n" }, { "commit": "1c2937d51a8873561b605173640e19726cf6d38d", "tree": "b13b10b97902e5b2c1c65d00a565a039e828047e", "parents": [ "453d24ba8207ad8e473eda7f9b13277345ea1adf", "742c476d8966ec8fb0bce3eec0e1956d609c6749" ], "author": { "name": "Maciej Żenczykowski", "email": "maze@google.com", "time": "Fri Dec 08 12:08:20 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Dec 08 12:08:20 2023 +0000" }, "message": "Merge \"Fix BpfLoaderRcUtils to support IOS_8859_1\" into main am: 742c476d89\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2864287\n\nChange-Id: I08c79f7266116cfe8d6b0ed42a6f026547660cbc\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "742c476d8966ec8fb0bce3eec0e1956d609c6749", "tree": "62bebe0f51bdfc67c09a5ef91bfab38ddfa8754c", "parents": [ "ce6f14073cf412c8aca91f887ac1617633fb004a", "71a65dc21b673586bd3cb378a56ac8d3f2af12e6" ], "author": { "name": "Maciej Żenczykowski", "email": "maze@google.com", "time": "Fri Dec 08 11:38:55 2023 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Fri Dec 08 11:38:55 2023 +0000" }, "message": "Merge \"Fix BpfLoaderRcUtils to support IOS_8859_1\" into main" }, { "commit": "453d24ba8207ad8e473eda7f9b13277345ea1adf", "tree": "6d53423aedced966321dd4564491da721209cae6", "parents": [ "07f8eac855bd1c33a122e12db826c7783e82ba36", "ce6f14073cf412c8aca91f887ac1617633fb004a" ], "author": { "name": "Mark Chien", "email": "markchien@google.com", "time": "Fri Dec 08 08:15:44 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Dec 08 08:15:44 2023 +0000" }, "message": "Merge \"Get rid of any unnecessary reset calls\" into main am: ce6f14073c\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2865435\n\nChange-Id: Ib49434f5b3d0a47ac29a33fdf09150d912815018\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "ce6f14073cf412c8aca91f887ac1617633fb004a", "tree": "a99182f85b34aec7e088783c313546b293c9aeb2", "parents": [ "86b95d405eede37afda83ff1606e929f3d171d7c", "4d7b7ecd7e10887cc80a330cdd40ceae9187db02" ], "author": { "name": "Mark Chien", "email": "markchien@google.com", "time": "Fri Dec 08 07:48:14 2023 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Fri Dec 08 07:48:14 2023 +0000" }, "message": "Merge \"Get rid of any unnecessary reset calls\" into main" }, { "commit": "07f8eac855bd1c33a122e12db826c7783e82ba36", "tree": "7970c8116536ea6baa9e13f9801de67ed18cc2b6", "parents": [ "c555dc32d255db49b8fbfb2fe1e05265547bf2aa", "86b95d405eede37afda83ff1606e929f3d171d7c" ], "author": { "name": "Ken Chen", "email": "cken@google.com", "time": "Fri Dec 08 07:08:41 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Dec 08 07:08:41 2023 +0000" }, "message": "Merge \"Reference DataSaver setting from BPF map on V+ only\" into main am: 86b95d405e\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2861608\n\nChange-Id: Ia1d888c88c48e50fcfab624fd28f75e847524a53\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "86b95d405eede37afda83ff1606e929f3d171d7c", "tree": "13be7a526f0a3469f3dc7c3e5e25508a720cd882", "parents": [ "bccd95fab62d5783eb1ee4f0b1379368782c9f6a", "9e1865e48eb8aa24e19c71f7624e2e3c068e98e4" ], "author": { "name": "Ken Chen", "email": "cken@google.com", "time": "Fri Dec 08 06:43:54 2023 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Fri Dec 08 06:43:54 2023 +0000" }, "message": "Merge \"Reference DataSaver setting from BPF map on V+ only\" into main" }, { "commit": "4d7b7ecd7e10887cc80a330cdd40ceae9187db02", "tree": "40c74bd59db33fcce423f7b0c63c2a7871cc20d1", "parents": [ "bccd95fab62d5783eb1ee4f0b1379368782c9f6a" ], "author": { "name": "Mark Chien", "email": "markchien@google.com", "time": "Fri Dec 08 06:33:28 2023 +0000" }, "committer": { "name": "Mark Chien", "email": "markchien@google.com", "time": "Fri Dec 08 06:34:09 2023 +0000" }, "message": "Get rid of any unnecessary reset calls\n\nCalling resets at the beginning of setUp is unnecessary.\n\nBug: 315368147\nTest: TH\n\nChange-Id: I87030bc867d90752e745fd4a274581d1f3230f85\n" }, { "commit": "71a65dc21b673586bd3cb378a56ac8d3f2af12e6", "tree": "d4f0cdb49992b79b852b0f611f1fe974e1edee44", "parents": [ "f75eacd3f56dbf8d99be8fd475e5dcc68bbfe635" ], "author": { "name": "Yuyang Huang", "email": "yuyanghuang@google.com", "time": "Fri Dec 08 15:03:01 2023 +0900" }, "committer": { "name": "Yuyang Huang", "email": "yuyanghuang@google.com", "time": "Fri Dec 08 15:03:01 2023 +0900" }, "message": "Fix BpfLoaderRcUtils to support IOS_8859_1\n\nTest: TH\nChange-Id: Ic53e903f7a971c92793e3360a5d3f53c97c0503b\n" }, { "commit": "38c7503ab5358256ef2e315e178b14b7409f513c", "tree": "bf9d6dd014d817cc0fe67230cfffb498618d94a6", "parents": [ "6f95ab255861dacede2758f7dfd67a3eebc33601" ], "author": { "name": "Junyu Lai", "email": "junyulai@google.com", "time": "Mon Dec 04 07:52:19 2023 +0000" }, "committer": { "name": "Junyu Lai", "email": "junyulai@google.com", "time": "Fri Dec 08 13:54:29 2023 +0800" }, "message": "[BR14] Tracker Data Saver status in ConnectivityService\n\nBYPASS_INCLUSIVE_LANGUAGE_REASON\u003dUsing public API\nTest: atest ConnectivityCoverageTests:android.net.connectivity.com.android.server.CSBpfNetMapsTest\n (on U and V devices respectively)\nBug: 297836825\nFix: 314858283\n\nChange-Id: Ibeac8cd3a33468c6539234255328affc6b3f8ffe\n" }, { "commit": "c555dc32d255db49b8fbfb2fe1e05265547bf2aa", "tree": "129145aa91e7f98f61f1a035ec8e0b8e5a2868fa", "parents": [ "95114398a25a58ca4bf847c8bce84ac7e2b919ba", "bccd95fab62d5783eb1ee4f0b1379368782c9f6a" ], "author": { "name": "Nate Jiang", "email": "qiangjiang@google.com", "time": "Fri Dec 08 03:36:42 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Dec 08 03:36:42 2023 +0000" }, "message": "Merge \"[CTS] Mark testGetRedactedNetworkCapabilitiesForPackage ConnectivityModuleTest\" into main am: bccd95fab6\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2861373\n\nChange-Id: I8fe3c0267864b09f0cabc337886cd304be477775\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "bccd95fab62d5783eb1ee4f0b1379368782c9f6a", "tree": "c52e10d3f002820a5e555a4bb7a04eabfc77abac", "parents": [ "3049df0ee084460e56febade8899d2d1b06bdee2", "14f557181ba9f8d4db77f0d3e54e4a754e363ec7" ], "author": { "name": "Nate Jiang", "email": "qiangjiang@google.com", "time": "Fri Dec 08 03:24:51 2023 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Fri Dec 08 03:24:51 2023 +0000" }, "message": "Merge \"[CTS] Mark testGetRedactedNetworkCapabilitiesForPackage ConnectivityModuleTest\" into main" }, { "commit": "95114398a25a58ca4bf847c8bce84ac7e2b919ba", "tree": "b6c4afb723e583690813f21863657a1c40249e6c", "parents": [ "04efefa31845e153ebb8afa903c62ce370fab488", "3049df0ee084460e56febade8899d2d1b06bdee2" ], "author": { "name": "Chiachang Wang", "email": "chiachangwang@google.com", "time": "Fri Dec 08 03:20:56 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Dec 08 03:20:56 2023 +0000" }, "message": "Merge \"Increase the LISTEN_ACTIVITY_TIMEOUT_MS timer\" into main am: 3049df0ee0\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2861585\n\nChange-Id: Ic4b73222c3f1ffcbe51b80a847846e3b3e89f4f7\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "3049df0ee084460e56febade8899d2d1b06bdee2", "tree": "546f9368ca9420e6ca4f248b62d28c7bde71ebb8", "parents": [ "b94bd28e330e440f5fc6d57521f29fecd6004e30", "89f8fa60f292804ff6308d79c411de6ce16ce7b3" ], "author": { "name": "Chiachang Wang", "email": "chiachangwang@google.com", "time": "Fri Dec 08 03:00:17 2023 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Fri Dec 08 03:00:17 2023 +0000" }, "message": "Merge \"Increase the LISTEN_ACTIVITY_TIMEOUT_MS timer\" into main" }, { "commit": "9e1865e48eb8aa24e19c71f7624e2e3c068e98e4", "tree": "6730f71a4fc7552473821b41eb2b7682bb579f8a", "parents": [ "6f95ab255861dacede2758f7dfd67a3eebc33601" ], "author": { "name": "Ken Chen", "email": "cken@google.com", "time": "Wed Dec 06 17:30:07 2023 +0800" }, "committer": { "name": "Ken Chen", "email": "cken@google.com", "time": "Fri Dec 08 02:42:51 2023 +0000" }, "message": "Reference DataSaver setting from BPF map on V+ only\n\nOnly reference DataSaverEnabled map on V+ platform because the\ninformation in map before platform V is not time-precise. See comment in\nthis commit for detail.\n\nBug: 288340533\nTest: presubmit\nChange-Id: I0795e88e6006e6d24d27b63c31d0e3ed81d0262c\n" }, { "commit": "31abe92c3675bbe6e597d191f9662c1196b3ca55", "tree": "a70cc89cb22bbcc4304df1041a2050f38173383a", "parents": [ "b94bd28e330e440f5fc6d57521f29fecd6004e30" ], "author": { "name": "Motomu Utsumi", "email": "motomuman@google.com", "time": "Wed Dec 06 13:13:59 2023 +0900" }, "committer": { "name": "Motomu Utsumi", "email": "motomuman@google.com", "time": "Fri Dec 08 11:42:35 2023 +0900" }, "message": "Use flags.aconfig in platform for android networking\n\nflags.aconfig for android networking is under\npackages/modules/Connectivity.\nBut, currently, mainline code should not read trunk stable flag.\nTo avoid confusion, this CL moves flags.aconfig to platform.\n\nBug: 315302281\nTest: TH\nChange-Id: I3a667cfa14d51e481bb4e99301c10319d2600e00\nMerged-In: I44c111577643bacb35b532cb156a61d30cfea31a\n" }, { "commit": "04efefa31845e153ebb8afa903c62ce370fab488", "tree": "c04cd0d235ef3522e37b3fe2b744e3b3fedf0b84", "parents": [ "fb52aab66a6b548172b6ee2288a6f313c2a98006", "b94bd28e330e440f5fc6d57521f29fecd6004e30" ], "author": { "name": "Yan Yan", "email": "evitayan@google.com", "time": "Thu Dec 07 23:26:46 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Dec 07 23:26:46 2023 +0000" }, "message": "Merge \"[XFRM_MSG_NEWSA] Support xfrm_replay_state_esn and XFRM_MSG_NEWSA\" into main am: b94bd28e33\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2833750\n\nChange-Id: I979388a1b9c3ef13a891b2e29690bbb18a1b3fb3\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "b94bd28e330e440f5fc6d57521f29fecd6004e30", "tree": "3b1bcbc671e5a72635f13c1265a80ab27bd66d43", "parents": [ "318b1abbaffd9e30a049ca77ed48e9b2ac9369e0", "0a892e6ec28f23827886dceff0e4997c10a1dd54" ], "author": { "name": "Yan Yan", "email": "evitayan@google.com", "time": "Thu Dec 07 22:55:48 2023 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Thu Dec 07 22:55:48 2023 +0000" }, "message": "Merge \"[XFRM_MSG_NEWSA] Support xfrm_replay_state_esn and XFRM_MSG_NEWSA\" into main" }, { "commit": "fb52aab66a6b548172b6ee2288a6f313c2a98006", "tree": "6db60759d2f9d7d4be47f99fa8d1f7c01415186f", "parents": [ "14520f8be5ad53120540a8b2a9f07763e77de1d4", "318b1abbaffd9e30a049ca77ed48e9b2ac9369e0" ], "author": { "name": "Yan Yan", "email": "evitayan@google.com", "time": "Thu Dec 07 21:16:39 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Dec 07 21:16:39 2023 +0000" }, "message": "Add a flag for getIpSecTransformState and IpSecTransformState am: 318b1abbaf\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2860825\n\nChange-Id: Ie8f1689029815e5d18d199d729c807d7d0f2fa2d\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "318b1abbaffd9e30a049ca77ed48e9b2ac9369e0", "tree": "326e2337f4783e1b95f3fe444402ab754bf80c48", "parents": [ "38f871c8e0e89fea5a0f7def539dcb1cc16e674b" ], "author": { "name": "Yan Yan", "email": "evitayan@google.com", "time": "Tue Dec 05 11:26:37 2023 -0800" }, "committer": { "name": "Yan Yan", "email": "evitayan@google.com", "time": "Thu Dec 07 18:47:24 2023 +0000" }, "message": "Add a flag for getIpSecTransformState and IpSecTransformState\n\nBug: 308011229\nTest: make\nChange-Id: Ib148b62b375f4f7b6a5d5ca82c74808bffa2e531\n" }, { "commit": "14520f8be5ad53120540a8b2a9f07763e77de1d4", "tree": "19b73e92955355a4b812b7cd7f6bd3b2981b95d1", "parents": [ "24b91526c5f05ab107327c981cd45fdc26042dfc", "38f871c8e0e89fea5a0f7def539dcb1cc16e674b" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Thu Dec 07 13:18:17 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Dec 07 13:18:17 2023 +0000" }, "message": "Merge \"Support network slicing permission check in multi-user environment\" into main am: 38f871c8e0\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2849536\n\nChange-Id: Ie0e57f2641fa4dd95be8e4f9b62233c97fc216bb\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "38f871c8e0e89fea5a0f7def539dcb1cc16e674b", "tree": "5f28f23b0e8fc847190a3cb735b2d54d7791c046", "parents": [ "516e27f9c3a946c8dfc9e8b79a7bd0942b174565", "4c7deee85929e86bbdf8d58efbf66adcd4bd6f7b" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Thu Dec 07 12:32:18 2023 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Thu Dec 07 12:32:18 2023 +0000" }, "message": "Merge \"Support network slicing permission check in multi-user environment\" into main" }, { "commit": "24b91526c5f05ab107327c981cd45fdc26042dfc", "tree": "3b5ab18e8bb9d0d3956b496ead003d9300555fbf", "parents": [ "6ce6511453ef429745498f5e8525dca283bb5671", "516e27f9c3a946c8dfc9e8b79a7bd0942b174565" ], "author": { "name": "Paul Hu", "email": "paulhu@google.com", "time": "Thu Dec 07 12:08:55 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Dec 07 12:08:55 2023 +0000" }, "message": "Replace MdnsPointerRecord contructor usage for queries am: 516e27f9c3\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2856947\n\nChange-Id: Ia983305248f41ebefb040eba341ef6ff7eca7af1\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "516e27f9c3a946c8dfc9e8b79a7bd0942b174565", "tree": "41ce08e7d2b7e9e0f62a58fc322735d3473ed4e4", "parents": [ "85cbe604df7d1be95bf74ba47dfa544fab2da725" ], "author": { "name": "Paul Hu", "email": "paulhu@google.com", "time": "Mon Dec 04 06:22:56 2023 +0000" }, "committer": { "name": "Paul Hu", "email": "paulhu@google.com", "time": "Thu Dec 07 08:38:48 2023 +0000" }, "message": "Replace MdnsPointerRecord contructor usage for queries\n\nThis is a test only change, replacing the MdnsPointerRecord\nconstructor usage for queries with the new version.\n\nBug: 312657709\nTest: atest FrameworksNetTests\nChange-Id: Ie9e51df78bfc27090503b861c5ac979201f10608\n" }, { "commit": "6ce6511453ef429745498f5e8525dca283bb5671", "tree": "afb88aa09aec716ac86865a22b9e2b137763f8b3", "parents": [ "2e9a823a4b1efc674623001cbcaa6bde48f48dcb", "85cbe604df7d1be95bf74ba47dfa544fab2da725" ], "author": { "name": "Motomu Utsumi", "email": "motomuman@google.com", "time": "Thu Dec 07 05:17:01 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Dec 07 05:17:01 2023 +0000" }, "message": "Update testAllowedUids to follow revert of canSeeAllowedUids am: 85cbe604df\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2862525\n\nChange-Id: I66056a8e90f281280a90017e40620ccbd7461eb4\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "85cbe604df7d1be95bf74ba47dfa544fab2da725", "tree": "e7e201dd61c8bcf6f06ecb7bf1250637441546e0", "parents": [ "f75eacd3f56dbf8d99be8fd475e5dcc68bbfe635" ], "author": { "name": "Motomu Utsumi", "email": "motomuman@google.com", "time": "Thu Dec 07 01:11:04 2023 +0900" }, "committer": { "name": "Motomu Utsumi", "email": "motomuman@google.com", "time": "Thu Dec 07 11:59:34 2023 +0900" }, "message": "Update testAllowedUids to follow revert of canSeeAllowedUids\n\naosp/2854709 reverted canSeeAllowedUids change done by aosp/2405720.\nBut aosp/2854709 did not update testAllowedUids and broke\ntestAllowedUids since cts can no longer see allowedUids.\nThis CL updates testAllowedUids to skip some test cases.\n\nFollowup CLs will allow ownerUid to see allowedUids again and re-enable\ntest cases.\n\nBug: 315112049\nTest: TH\nChange-Id: I1e4ca09ad15b6150182325cbfda1548e5fec79d1\n" }, { "commit": "2e9a823a4b1efc674623001cbcaa6bde48f48dcb", "tree": "350aa518b75edffad224dbf520a5cd90b5fb3d13", "parents": [ "83bf6759a8a3a5a63d03d70391b8e29bbc9d4e3f", "f75eacd3f56dbf8d99be8fd475e5dcc68bbfe635" ], "author": { "name": "Xiao Ma", "email": "xiaom@google.com", "time": "Wed Dec 06 13:59:56 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Dec 06 13:59:56 2023 +0000" }, "message": "Merge \"Add a new PIO flag: DHCPv6-PD preferred flag.\" into main am: f75eacd3f5\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2861287\n\nChange-Id: I277c22b3c378bad34a450f13646d10e8412aa9eb\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "f75eacd3f56dbf8d99be8fd475e5dcc68bbfe635", "tree": "08d1bc7bb81ae4f81fb5bff8509aaa239e0b3f15", "parents": [ "6f95ab255861dacede2758f7dfd67a3eebc33601", "594e34f09add6306f49411a4694a8901666160d4" ], "author": { "name": "Xiao Ma", "email": "xiaom@google.com", "time": "Wed Dec 06 12:48:33 2023 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Wed Dec 06 12:48:33 2023 +0000" }, "message": "Merge \"Add a new PIO flag: DHCPv6-PD preferred flag.\" into main" }, { "commit": "d5c0276b342cc12337d45788a8b91e135f61b878", "tree": "1d2511e95e62c722bd59f4c0f2ec903a071ebb67", "parents": [ "38795d6f89ed0ea1e21feb6f5c806916771b2441" ], "author": { "name": "Yang Sun", "email": "sunytt@google.com", "time": "Wed Dec 06 19:29:55 2023 +0800" }, "committer": { "name": "Yang Sun", "email": "sunytt@google.com", "time": "Wed Dec 06 19:57:29 2023 +0800" }, "message": "Mark NetworkStaticLibTestsLib as test for lint\n\nThis can avoid VisibleForTesting warnings in tests.\n\nTest: atest NetworkStaticLibTests\nChange-Id: If6abc33cf266246aeac22ff4b53cfba386c8979f\n" }, { "commit": "83bf6759a8a3a5a63d03d70391b8e29bbc9d4e3f", "tree": "2344988e4a15eba42cce7d7039fd533f92345ab2", "parents": [ "e3d0f99fd0953c497721d840390637ecec217853", "6f95ab255861dacede2758f7dfd67a3eebc33601" ], "author": { "name": "Motomu Utsumi", "email": "motomuman@google.com", "time": "Wed Dec 06 07:21:26 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Dec 06 07:21:26 2023 +0000" }, "message": "Merge \"Revert canSeeAllowedUids for ownerUid\" into main am: 6f95ab2558\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2854709\n\nChange-Id: Iddb417f1f5125d804aad33363585fd3b479dafc1\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "6f95ab255861dacede2758f7dfd67a3eebc33601", "tree": "a8794354cbd1b772d391d521f7fd038b40a2ddbe", "parents": [ "2f67e0f2d4ae43450a906964bd4dc24c9ed018ad", "eb4a1968ef83242665b6487091e4cf2cd95a642f" ], "author": { "name": "Motomu Utsumi", "email": "motomuman@google.com", "time": "Wed Dec 06 05:53:00 2023 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Wed Dec 06 05:53:00 2023 +0000" }, "message": "Merge \"Revert canSeeAllowedUids for ownerUid\" into main" }, { "commit": "594e34f09add6306f49411a4694a8901666160d4", "tree": "e6ec0ba2971caf5da89fc523ff7facaa8e252d54", "parents": [ "ed353e90e29a90f2cc79bd227b5aa93b5f505d96" ], "author": { "name": "Xiao Ma", "email": "xiaom@google.com", "time": "Wed Dec 06 13:34:29 2023 +0900" }, "committer": { "name": "Xiao Ma", "email": "xiaom@google.com", "time": "Wed Dec 06 13:41:07 2023 +0900" }, "message": "Add a new PIO flag: DHCPv6-PD preferred flag.\n\nThe new P flag is defined in\nhttps://datatracker.ietf.org/doc/draft-ietf-6man-pio-pflag/.\n\nBug: 315069348\nTest: TH\nChange-Id: Ie386cc8b9fbe136333b46c73da785e02983a582b\n" }, { "commit": "14f557181ba9f8d4db77f0d3e54e4a754e363ec7", "tree": "5b4b877e19488ed3fe2b6159419035c249597e99", "parents": [ "f73d80b61cd4714826e931034dd98e3326e083e1" ], "author": { "name": "Nate Jiang", "email": "qiangjiang@google.com", "time": "Wed Dec 06 03:56:44 2023 +0000" }, "committer": { "name": "Nate Jiang", "email": "qiangjiang@google.com", "time": "Wed Dec 06 03:56:44 2023 +0000" }, "message": "[CTS] Mark testGetRedactedNetworkCapabilitiesForPackage ConnectivityModuleTest\n\nThis test require latest Connectivity module\n\nBug: 314392808\nTest: mts-tradefed run mts-wifi\nChange-Id: I283ffe9b20af957818584cddfb0d188a5a8625a7\n" }, { "commit": "e3d0f99fd0953c497721d840390637ecec217853", "tree": "93944fc81ccb2f6ad6802c26331a55758996cb9c", "parents": [ "3ba75acdec2eb7ee462c4aed5e15e153afffc57c", "2f67e0f2d4ae43450a906964bd4dc24c9ed018ad" ], "author": { "name": "Junyu Lai", "email": "junyulai@google.com", "time": "Wed Dec 06 02:58:58 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Dec 06 02:58:58 2023 +0000" }, "message": "Merge \"[AF01] Move NetworkStatsCollection comparison code to NetworkStatsCollection\" into main am: 2f67e0f2d4\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2859025\n\nChange-Id: I407d4ce42ad57710cf5705bbdd216fe5efb93bd1\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "3ba75acdec2eb7ee462c4aed5e15e153afffc57c", "tree": "f7f9da13d25f7dd9b624dca56870c2c70a6f4a6b", "parents": [ "fc12688db5b8d514ff0df526efe28711788dda56", "dc7a325a552adad761b5d3435686911cdc69888f" ], "author": { "name": "Motomu Utsumi", "email": "motomuman@google.com", "time": "Wed Dec 06 02:58:29 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Dec 06 02:58:29 2023 +0000" }, "message": "Merge \"Remove workaround to remove FlaggedAPI in ump\" into main am: dc7a325a55\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2850388\n\nChange-Id: I58bfcaa376439ed2cf515c82dbcf2839269c4711\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "2f67e0f2d4ae43450a906964bd4dc24c9ed018ad", "tree": "03ce1fecd3195d6c969d2e009b6d30e77c7ef7f8", "parents": [ "dc7a325a552adad761b5d3435686911cdc69888f", "77f84a40d1336a64a8e21ecdda1cff4c15a79323" ], "author": { "name": "Junyu Lai", "email": "junyulai@google.com", "time": "Wed Dec 06 02:26:14 2023 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Wed Dec 06 02:26:14 2023 +0000" }, "message": "Merge \"[AF01] Move NetworkStatsCollection comparison code to NetworkStatsCollection\" into main" }, { "commit": "89f8fa60f292804ff6308d79c411de6ce16ce7b3", "tree": "c28e3160c3dc59cc6ced2ddbf7eb67e96084d9bc", "parents": [ "e01fc685a28093909f218b04ee51da69c90d516d" ], "author": { "name": "Chiachang Wang", "email": "chiachangwang@google.com", "time": "Wed Dec 06 01:47:32 2023 +0000" }, "committer": { "name": "Chiachang Wang", "email": "chiachangwang@google.com", "time": "Wed Dec 06 01:47:32 2023 +0000" }, "message": "Increase the LISTEN_ACTIVITY_TIMEOUT_MS timer\n\nThe test reuqires WiFi becomes the default network. But in\nsome bad networks, the probing time may take more than the\nexisting timer(5s). Increase it to 30s to prevent flakes\ncausing by bad network.\n\nFix: 313372234\nTest: atest CtsNetTestCases\nChange-Id: Ie0d2f014d2551826596d4a0e28448ba129f5e9eb\n" }, { "commit": "dc7a325a552adad761b5d3435686911cdc69888f", "tree": "3da1f3c50795f8b2a6a6494bed9bef390a13a86e", "parents": [ "4e6bd8f7d4b0c8935291a154b2a1c920c0454cff", "88410c6fd6cdc1bd8e1b01ab10253ff53ed88432" ], "author": { "name": "Motomu Utsumi", "email": "motomuman@google.com", "time": "Wed Dec 06 01:17:43 2023 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Wed Dec 06 01:17:43 2023 +0000" }, "message": "Merge \"Remove workaround to remove FlaggedAPI in ump\" into main" }, { "commit": "fc12688db5b8d514ff0df526efe28711788dda56", "tree": "ee8560e2801e30e5ed150bb2a142879c8929ef54", "parents": [ "8c9231ff0d2867e667e46c81bfc82f2098beccc2", "4e6bd8f7d4b0c8935291a154b2a1c920c0454cff" ], "author": { "name": "Yan Yan", "email": "evitayan@google.com", "time": "Tue Dec 05 21:28:54 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Dec 05 21:28:54 2023 +0000" }, "message": "Merge \"[XFRM_MSG_NEWSA] Support xfrm_stats and xfrm_usersa_info\" into main am: 4e6bd8f7d4\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2826700\n\nChange-Id: I47770c0c4f7e7bd8c6fdf84cd901ad25307a3bd9\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "4e6bd8f7d4b0c8935291a154b2a1c920c0454cff", "tree": "9ba7690ca1bb52b6c02d7cb9e818829c2f3742a8", "parents": [ "38795d6f89ed0ea1e21feb6f5c806916771b2441", "c9a194c44bd692d82dc29b2cd743fe92e40f4ad2" ], "author": { "name": "Yan Yan", "email": "evitayan@google.com", "time": "Tue Dec 05 20:26:33 2023 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Tue Dec 05 20:26:33 2023 +0000" }, "message": "Merge \"[XFRM_MSG_NEWSA] Support xfrm_stats and xfrm_usersa_info\" into main" }, { "commit": "0a892e6ec28f23827886dceff0e4997c10a1dd54", "tree": "92dd81972a6b13a9ad9269ffe6e6f4f62bd4771e", "parents": [ "c9a194c44bd692d82dc29b2cd743fe92e40f4ad2" ], "author": { "name": "Yan Yan", "email": "evitayan@google.com", "time": "Wed Nov 15 19:27:50 2023 +0000" }, "committer": { "name": "Yan Yan", "email": "evitayan@google.com", "time": "Tue Dec 05 10:49:16 2023 -0800" }, "message": "[XFRM_MSG_NEWSA] Support xfrm_replay_state_esn and XFRM_MSG_NEWSA\n\nBug: 308011229\nTest: atest NetworkStaticLibTests:com.android.net.moduletests.util.netlink\n (new tests added)\nChange-Id: I4c21a64c634b1814d52ce81a48abe2550876b755\n" }, { "commit": "c9a194c44bd692d82dc29b2cd743fe92e40f4ad2", "tree": "b0fd271a7b30dda28465a81d9b0993eda25d4c5f", "parents": [ "3139f9794cd9fa275ef4b3405cf4b5e2c37d41d5" ], "author": { "name": "Yan Yan", "email": "evitayan@google.com", "time": "Sat Nov 11 00:57:12 2023 +0000" }, "committer": { "name": "Yan Yan", "email": "evitayan@google.com", "time": "Tue Dec 05 10:36:09 2023 -0800" }, "message": "[XFRM_MSG_NEWSA] Support xfrm_stats and xfrm_usersa_info\n\nBug: 308011229\nTest: atest NetworkStaticLibTests:com.android.net.moduletests.util.netlink\n (new tests added)\nChange-Id: I8641cf36a790d7b15fbe41b4da328c1d91fcec1e\n" } ], "next": "8c9231ff0d2867e667e46c81bfc82f2098beccc2" }