)]}' { "log": [ { "commit": "e950f6d39c96f409114271a2bbeb4631348fffa9", "tree": "f060d52057a3bae047449f0ce5bd85998565c6a9", "parents": [ "0f579646cdfb0fc4bec6bb6f865868814cd78ce9" ], "author": { "name": "Maciej Żenczykowski", "email": "maze@google.com", "time": "Fri Apr 26 11:52:25 2024 -0700" }, "committer": { "name": "Maciej Żenczykowski", "email": "maze@google.com", "time": "Fri Apr 26 22:48:30 2024 +0000" }, "message": "prevent DscpPolicyTracker from printing big scary exception stack\n\nwhen the program is missing due to too old kernel.\nProgram presence is already enforced by CRITICAL annotation and bpfloader.\n\nTest: TreeHugger\nSigned-off-by: Maciej Żenczykowski \u003cmaze@google.com\u003e\nChange-Id: Ic5f53636c833e65c611a7b8069f28c088c249158\n" }, { "commit": "45f71b0b3d276bd497ee72508a9bbf46e0324492", "tree": "c6514b8c72d258ac15101f7f19108a30080f46a9", "parents": [ "8731ad1e45671c50849d9786f3616bbf7ab48c8e", "7a7d1ac87d16a28726c4e0d34b5ea553be41eea8" ], "author": { "name": "Kholoud Mohamed", "email": "kholoudm@google.com", "time": "Thu Apr 25 09:51:23 2024 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Thu Apr 25 09:51:23 2024 +0000" }, "message": "Merge \"Fix DO check on headless devices\" into main" }, { "commit": "2c248d2108503a531576919d47e6734a6d800c78", "tree": "0cf61c84d1714205469ecc81f47c775962827bd2", "parents": [ "c04493234e832651527654def9e1d8bbad092570" ], "author": { "name": "Motomu Utsumi", "email": "motomuman@google.com", "time": "Tue Mar 26 18:25:39 2024 +0900" }, "committer": { "name": "Motomu Utsumi", "email": "motomuman@google.com", "time": "Wed Apr 24 13:16:42 2024 +0900" }, "message": "Add @RequiresApi(TIRAMISU) to BpfNetMapsUtils\n\nWith this annotation, errorprone build will fail if callers don\u0027t check\nsdk version before calling any methods in BpfNetMapsUtils.\n\nBug: 328732146\nTest: TH\nChange-Id: Ifa52dc1d2766f8d46dfdc4f6ca9dbb963406c084\n" }, { "commit": "c04493234e832651527654def9e1d8bbad092570", "tree": "1e14c79378d62e31cbedbb4f415a767e8384706c", "parents": [ "bd50241d0383839b858d56aa917b7d394403ba8d", "11d3345daacc84dea87d6d36be8caad437e378b3" ], "author": { "name": "Motomu Utsumi", "email": "motomuman@google.com", "time": "Wed Apr 24 03:51:09 2024 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Wed Apr 24 03:51:09 2024 +0000" }, "message": "Merge \"Add firewall chains for HAPPY_BOX and user/admin PENALTY_BOX\" into main" }, { "commit": "173ffb927826759fdedc6f8a2d243a18a6f76c90", "tree": "dce8865fa29c37bd2ff51ca98e63feca3fb846b4", "parents": [ "0fc03c7c31fc4116c45f66dc8fcab0f08980453f", "4e7baadc71201a94de713d73e41b437d27f072aa" ], "author": { "name": "Yang Sun", "email": "sunytt@google.com", "time": "Tue Apr 23 12:58:39 2024 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Tue Apr 23 12:58:39 2024 +0000" }, "message": "Merge \"Use helper function getIndexForValue in MulticastRoutingCoordinator.\" into main" }, { "commit": "4e7baadc71201a94de713d73e41b437d27f072aa", "tree": "ca949da354c23f1b57e05140471bedf7832ad2e5", "parents": [ "9671e9a6d8ba0a32bdd28f45faa5b1b06c0c0e26" ], "author": { "name": "Yang Sun", "email": "sunytt@google.com", "time": "Sun Apr 14 16:24:37 2024 +0800" }, "committer": { "name": "Yang Sun", "email": "sunytt@google.com", "time": "Tue Apr 23 17:22:15 2024 +0800" }, "message": "Use helper function getIndexForValue in MulticastRoutingCoordinator.\n\nThe SparseArray.indexOfValue() uses \u003d\u003d to compare values,\nMulticastRoutingCoordinator uses SparseArray with String type values,\nand the indexOfValue function would sometimes return -1 when looking for\na value in the SparseArray.\n\nAdded a helper function getIndexForValue in CollectionUtils to get index\nby comparing values with equals, and used this function in MulticastRoutingCoordinator.\n\nUpdated\nMulticastRoutingCoordinatorServiceTest#testMulticastRouting_applyConfigNone_removesMfc\ntest case to use copies of interface names when updating the multicast\nconfigs, so the test would fail without this fix.\n\nTest: atest NetworkStaticLibTests:com.android.net.moduletests.util.CollectionUtilsTest#testGetIndexForValue\natest android.net.connectivity.com.android.server.connectivity.MulticastRoutingCoordinatorServiceTest#testMulticastRouting_applyConfigNone_removesMfc\n\nChange-Id: I862242d6be01b8552cdd6af6c9691948a9f0bfe0\n" }, { "commit": "11d3345daacc84dea87d6d36be8caad437e378b3", "tree": "f5cec4dc8d4385c04c609a661e60367161793144", "parents": [ "21b36d8c6856849c491578e8b86909b2475e2de7" ], "author": { "name": "Motomu Utsumi", "email": "motomuman@google.com", "time": "Tue Apr 02 18:29:08 2024 +0900" }, "committer": { "name": "Motomu Utsumi", "email": "motomuman@google.com", "time": "Tue Apr 23 15:04:28 2024 +0900" }, "message": "Add firewall chains for HAPPY_BOX and user/admin PENALTY_BOX\n\nFollow up CLs will update CS to generate blocked reason from bpf map\ninstead of asking NPMS.\n\nHowever, one issue is NPMS set PENALTY_BOX for\nBLOCKED_METERED_REASON_USER_RESTRICTED and\nBLOCKED_METERED_REASON_ADMIN_DISABLED without telling the reason.\nSo, CS can not know the reason of PENALTY_BOX.\n\nThis CL add new firewall chain and match to distinguish reasons.\nNPMS must call setUidFirewallRule with\nFIREWALL_CHAIN_METERED_DENY_USER or FIREWALL_CHAIN_METERED_DENY_ADMIN\nbased on the reason so that CS can know the reason of restriction.\n\nBug: 332628891\nTest: atest com.android.cts.net.HostsideRestrictBackgroundNetworkTests\nChange-Id: Ia4ad4bdb345abc22c782630e828edfad2452db36\n" }, { "commit": "7a7d1ac87d16a28726c4e0d34b5ea553be41eea8", "tree": "348c77ca60a2dac7f8a87217434dc0a15c4f8f76", "parents": [ "fd207b88e7c5e024056d8ecc9b13b792b2b8ea9f" ], "author": { "name": "Kholoud Mohamed", "email": "kholoudm@google.com", "time": "Fri Apr 19 09:35:36 2024 +0000" }, "committer": { "name": "Android Build Cherrypicker Worker", "email": "android-build-cherrypicker-worker@google.com", "time": "Fri Apr 19 09:35:36 2024 +0000" }, "message": "Fix DO check on headless devices\n\nBug: 289515470\nTest: btest a.d.c.PreferentialNetworkServiceTest\nMerged-In: Id93322caca55e122339701e4c69b4ded57b8f6cc\nChange-Id: Id93322caca55e122339701e4c69b4ded57b8f6cc\n" }, { "commit": "3218a81a57b70f03c311a385fe6cef272e15ac95", "tree": "d0650650f0ebc8dfece0415f7d4ff6b2bbd641a4", "parents": [ "21b36d8c6856849c491578e8b86909b2475e2de7" ], "author": { "name": "Maciej Żenczykowski", "email": "maze@google.com", "time": "Mon Apr 15 00:39:59 2024 -0700" }, "committer": { "name": "Maciej Żenczykowski", "email": "maze@google.com", "time": "Mon Apr 15 02:13:56 2024 -0700" }, "message": "NetBpfLoad: use exec path for api level 35+ (ie. V)\n\nTest: TreeHugger\nSigned-off-by: Maciej Żenczykowski \u003cmaze@google.com\u003e\nChange-Id: I075b2a6166454d36599b0ecc25ccaeec545d183c\n" }, { "commit": "c6678bbd7107b62019b9a584b29de9da6be76ac4", "tree": "eb4a66dc3b6dd09e2102ef38b9872bda5696b43e", "parents": [ "cede6542da1024052a39c4a21d0e79846204f0f4", "a658220234c9e08b4ac1e142ed114d514a4287f9" ], "author": { "name": "Patrick Rohr", "email": "prohr@google.com", "time": "Thu Apr 11 19:37:46 2024 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Thu Apr 11 19:37:46 2024 +0000" }, "message": "Merge \"Revert \"Use bpf map based isUidNetworkingBlocked on V+\"\" into main" }, { "commit": "a658220234c9e08b4ac1e142ed114d514a4287f9", "tree": "6ed275b2073523380f9dc11befbad752561845d3", "parents": [ "9b272fa53abf13b6ddc0e23ce424b7bdfae9381f" ], "author": { "name": "Patrick Rohr", "email": "prohr@google.com", "time": "Thu Apr 11 16:54:04 2024 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Thu Apr 11 16:54:04 2024 +0000" }, "message": "Revert \"Use bpf map based isUidNetworkingBlocked on V+\"\n\nThis reverts commit 9b272fa53abf13b6ddc0e23ce424b7bdfae9381f.\n\nReason for revert: possible root cause of b/333340911.\n\nChange-Id: Ic4923fd19db7e4704a3ef02d79644b47c271e18e\n" }, { "commit": "aeacff5033a7c37bc66dce27ca15db7ddc118cd8", "tree": "72c2b4b0f30e92bd86e8587987e0e9e9582b11ee", "parents": [ "c634eb57260d93ccb0383159e08de9e0d9bf5db8", "724d8972e48803ba52b776a0f9b1af2836d71cbe" ], "author": { "name": "Suprabh Shukla", "email": "suprabh@google.com", "time": "Tue Apr 02 05:47:56 2024 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Tue Apr 02 05:47:56 2024 +0000" }, "message": "Merge \"Add a flag to disable the background firewall chain\" into main" }, { "commit": "724d8972e48803ba52b776a0f9b1af2836d71cbe", "tree": "619e46788fff148e53df4e85ce917f780dedd72e", "parents": [ "90d53fa65eddfe97da7d7e12da16bcb8dfd9e72b" ], "author": { "name": "Suprabh Shukla", "email": "suprabh@google.com", "time": "Tue Mar 26 16:59:11 2024 -0700" }, "committer": { "name": "Suprabh Shukla", "email": "suprabh@google.com", "time": "Mon Apr 01 16:37:32 2024 -0700" }, "message": "Add a flag to disable the background firewall chain\n\nThe BACKGROUND firewall chain has been recently added. We want to\nbe able to turn it off in case of contingencies with a device-config\nflag flip.\n\nThe flag is assumed to be boot-stable and its value is read at boot.\nWhen the flag is off, we ignore any operation on this firewall chain.\n\nAdditionally, this chain is always considered disabled on versions\nupto UPSIDE_DOWN_CAKE.\n\nNote: All firewall chains are in disabled state at boot by default.\n\nTest: atest FrameworksNetTests\nTest: Manually, using adb shell device_config commands.\n\nBug: 331484830\nChange-Id: I9ccc483e02e27a584da6714931466a9f2ec95ca9\n" }, { "commit": "6cbb7cf3d5e99f382cd4965f0fd2e9e0106ad2ee", "tree": "7678b0e8d5d2cfb386d0f3619aab92d410338d32", "parents": [ "0469317169d7a6f39aea2ecbcca45440dbe405cf", "0668238d5063ceab5886a548dbe263086334ed69" ], "author": { "name": "Nagendra Prasad Nagarle Basavaraju", "email": "nagendranb@google.com", "time": "Mon Apr 01 06:19:52 2024 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Mon Apr 01 06:19:52 2024 +0000" }, "message": "Merge \"SatelliteAccessController enhancements to handle delete user scenario\" into main" }, { "commit": "0668238d5063ceab5886a548dbe263086334ed69", "tree": "a8edbc225f7ca224ef17f11f920c100dfcee8491", "parents": [ "80383822b196974578dbc5eecb43b6b87ce38048" ], "author": { "name": "Nagendra Prasad Nagarle Basavaraju", "email": "nagendranb@google.com", "time": "Wed Mar 13 15:46:39 2024 +0000" }, "committer": { "name": "Nagendra Prasad Nagarle Basavaraju", "email": "nagendranb@google.com", "time": "Mon Apr 01 04:19:12 2024 +0000" }, "message": "SatelliteAccessController enhancements to handle delete user scenario\n\n- Handle onRoleHoldersChanged is not triggered even if the user has a\n default app setup and gets deleted scenario.\n\n- Adding ACTION_USER_REMOVED intent filter, to monitor for User\n removal. This to used to update satellite fallback uid list\n and to keep allowed uid range updated at multi layer request\n of track default and satellite transport with Internet\n restricted capability\n\nBug: 326373613\nTest: atest FrameworksNetTests\nChange-Id: I1f30cd129309486bccbc61802ed600c142077411\n" }, { "commit": "e7a49305eebc131e85d119835d8d48e09c6f1311", "tree": "587977dddacbbb3bb4d73c935f717c2ab62d96ec", "parents": [ "1038c141fe1006b484f00e3af0b359fb4b045216", "9b272fa53abf13b6ddc0e23ce424b7bdfae9381f" ], "author": { "name": "Motomu Utsumi", "email": "motomuman@google.com", "time": "Thu Mar 28 12:23:49 2024 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Thu Mar 28 12:23:49 2024 +0000" }, "message": "Merge \"Use bpf map based isUidNetworkingBlocked on V+\" into main" }, { "commit": "68d68d82ed5e4cb962036bde97d5629985659d6a", "tree": "6a45effd7f88f01c5eecc1f311efd4a520de4448", "parents": [ "28090042b6cfa5c64eee69553e4e947f78b98bbc", "3aa62e67737dadf09e9ede71033a4107a8bb741d" ], "author": { "name": "Yang Sun", "email": "sunytt@google.com", "time": "Thu Mar 28 06:23:57 2024 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Thu Mar 28 06:23:57 2024 +0000" }, "message": "Merge \"Separate Struct.java into its own lib.\" into main" }, { "commit": "3aa62e67737dadf09e9ede71033a4107a8bb741d", "tree": "f6f27b8548655057e0ca359023f547be5610c553", "parents": [ "612de50da28c7c78436c98ec92c0685e91b57c3b" ], "author": { "name": "Yang Sun", "email": "sunytt@google.com", "time": "Tue Mar 12 21:23:19 2024 +0800" }, "committer": { "name": "Yang Sun", "email": "sunytt@google.com", "time": "Wed Mar 27 20:15:17 2024 +0800" }, "message": "Separate Struct.java into its own lib.\n\n* Struct.java is removed from net-utils-device-common-bpf and\n net-utils-device-common-struct\u0027s source list\n* Created a lib net-utils-device-common-struct-base for Struct.java\n* Updated libs that require Struct.java to include\n net-utils-device-common-struct-base.\n* Replaced net-utils-multicast-forwarding-structs with\n net-utils-device-common-struct in service-connectivity\n\nBug: 323503345\n\nTest: build tethering module.\nChange-Id: I3f60715c3d8043b7569db7612dee9d4fa1ccba59\n" }, { "commit": "ea408d396b5a9c4d209020be58ae5b482b32d561", "tree": "1ee1526b9b2fdd41ef93037997a25f60fbd9ff68", "parents": [ "f74488eb373db05c00af55af638c6c2d40b13c82" ], "author": { "name": "Muhammad Qureshi", "email": "muhammadq@google.com", "time": "Tue Mar 26 10:16:34 2024 -0700" }, "committer": { "name": "Muhammad Qureshi", "email": "muhammadq@google.com", "time": "Wed Mar 27 06:27:46 2024 +0000" }, "message": "Add RequiresApi annotation for T+ method call.\n\nStatsLog.write() methods are being annotated with @RequiresApi annotations as\nappropriate. The usage here is already guarded but the guarding happens\nupstream so NewApi lint still complains. Adding RequiresApi annotation\nupstream close to where the sdk version check occurs fixes the\ncomplaint.\n\nBug: 328120273\nTest: m lint-check\nChange-Id: I311dad060bd941b99b811895048462887ed9b926\n" }, { "commit": "9b272fa53abf13b6ddc0e23ce424b7bdfae9381f", "tree": "196876c72415bc3411ab75c879725be28f403ace", "parents": [ "cb448f5c783c47a82528dbc55b93fcdd972e172a" ], "author": { "name": "Motomu Utsumi", "email": "motomuman@google.com", "time": "Fri Mar 15 19:08:01 2024 +0900" }, "committer": { "name": "Motomu Utsumi", "email": "motomuman@google.com", "time": "Tue Mar 26 19:16:57 2024 +0900" }, "message": "Use bpf map based isUidNetworkingBlocked on V+\n\nNetworkPolicyManager#isUidNetworkingBlocked does not know about some\nfirewall chains status(e.g. FIREWALL_CHAIN_OEM_DENY_1)\nSo BpfNetMaps#isUidNetworkingBlocked is more correct but there could be\nsome behavior difference.\nTo avoid breaking devices and have longer verification time, this CL\nupdates to use BpfNetMaps#isUidNetworkingBlocked only on V+ devices.\n\nBug: 328732146\nTest: TH\nChange-Id: I60f84a5fff90386103692841dead465652249446\n" }, { "commit": "98eb360c0d42ac8b91e7e91459a86e3e5d3002c2", "tree": "7a86475574d98b660051a3c2549c95be69bfa91c", "parents": [ "452796c3234ea73841d9c40dbb0aeb34d1e6dc2d", "4fcaa4e803d19fee091a97d4dca11d13988580eb" ], "author": { "name": "Motomu Utsumi", "email": "motomuman@google.com", "time": "Thu Mar 21 07:22:41 2024 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Thu Mar 21 07:22:41 2024 +0000" }, "message": "Merge \"Use connectivityHandler in CarrierPrivilegeAuthenticator\" into main" }, { "commit": "452796c3234ea73841d9c40dbb0aeb34d1e6dc2d", "tree": "89d9506405568936475241bc30f38163ba2a06ca", "parents": [ "b3a55ce385b04b43981637728a37d4433c98d8a3", "2f79f58c06f65113b82a2120e08790da310ef1f1" ], "author": { "name": "Motomu Utsumi", "email": "motomuman@google.com", "time": "Thu Mar 21 06:33:17 2024 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Thu Mar 21 06:33:17 2024 +0000" }, "message": "Merge \"Move isChainEnabled and getUidRule to BpfNetMapsUtils\" into main" }, { "commit": "83af4a36a8c9d9556b2bcd6f2cf2a3c162f89149", "tree": "ce896a0ef02c26ba76b6f7ddd43cd12bf2a256fd", "parents": [ "b21fec534a086d53f726cfc8a79148bdac282a89", "732a14164fbfa417b433cc7f6545b5542dcfa523" ], "author": { "name": "Maciej Żenczykowski", "email": "maze@google.com", "time": "Wed Mar 20 00:27:58 2024 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Wed Mar 20 00:27:58 2024 +0000" }, "message": "Merge \"NetBpfLoad: rework mainline bpf execution codepath\" into main" }, { "commit": "732a14164fbfa417b433cc7f6545b5542dcfa523", "tree": "368c94665c9b606370e88861e84f811d61f70c16", "parents": [ "11141da6239c1b99300f65d6f742dcccce4841fb" ], "author": { "name": "Maciej Żenczykowski", "email": "maze@google.com", "time": "Thu Mar 14 00:17:18 2024 -0700" }, "committer": { "name": "Maciej Żenczykowski", "email": "maze@google.com", "time": "Tue Mar 19 21:45:21 2024 +0000" }, "message": "NetBpfLoad: rework mainline bpf execution codepath\n\n(for now for better testing we don\u0027t make V special)\n\nTest: TreeHugger\nSigned-off-by: Maciej Żenczykowski \u003cmaze@google.com\u003e\nChange-Id: Id2835bd393c0ec9e1710644681bc5aab0d7d2aae\n" }, { "commit": "d77b3c4af2f1597e53cd825935c7837f18b21ab2", "tree": "e35e676f6d7cb929a695860eae4921c0296edb99", "parents": [ "ab1945c790b33eca078ff6f552580a5397d83e0d", "8b3f9d9e3ebdfcff1d75e2ae2064745cb273cee4" ], "author": { "name": "Maciej Żenczykowski", "email": "maze@google.com", "time": "Tue Mar 19 16:23:43 2024 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Tue Mar 19 16:23:43 2024 +0000" }, "message": "Merge \"clat bpf: add byte/packet counter\" into main" }, { "commit": "ab1945c790b33eca078ff6f552580a5397d83e0d", "tree": "ca617642835d4adb877770e12e1a3c6f6b53c340", "parents": [ "97b966eff99a6f8f352aaea2099ad0bf5642271f", "ea4390cc4c8f359f1838b0e0f7f8aae348049867" ], "author": { "name": "Kangping Dong", "email": "wgtdkp@google.com", "time": "Tue Mar 19 12:21:23 2024 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Tue Mar 19 12:21:23 2024 +0000" }, "message": "Merge changes from topic \"overlay-vendor-model-name\" into main\n\n* changes:\n [Thread] support customize meshcop txt via resourceoverlay\n [Thread] add resourceoverlay config for vendor and model name\n" }, { "commit": "8b3f9d9e3ebdfcff1d75e2ae2064745cb273cee4", "tree": "7033a4d94e6ae5eff85caca70254beb4c13983f8", "parents": [ "a490186098067988ff68269bb3b3b6a9f422ef11" ], "author": { "name": "Maciej Żenczykowski", "email": "maze@google.com", "time": "Wed Mar 13 03:39:36 2024 +0000" }, "committer": { "name": "KH Shi", "email": "kenghua@google.com", "time": "Tue Mar 19 07:54:36 2024 +0000" }, "message": "clat bpf: add byte/packet counter\n\nBug: 285124667\nTest: TreeHugger,\n atest FrameworksNetTests:android.net.connectivity.com.android.server.connectivity.ClatCoordinatorTest\nSigned-off-by: Maciej Żenczykowski \u003cmaze@google.com\u003e\nChange-Id: I5b59f0c05d41030f99160f68058c61eadd24fbbd\n" }, { "commit": "2f79f58c06f65113b82a2120e08790da310ef1f1", "tree": "9864f09849aaeedf3d73a7a0d4dbfb26b99941d1", "parents": [ "bb35aa1947fdbec125481202f3312ea7845c5832" ], "author": { "name": "Motomu Utsumi", "email": "motomuman@google.com", "time": "Mon Mar 18 19:24:46 2024 +0900" }, "committer": { "name": "Motomu Utsumi", "email": "motomuman@google.com", "time": "Tue Mar 19 04:21:29 2024 +0000" }, "message": "Move isChainEnabled and getUidRule to BpfNetMapsUtils\n\nThis CL also adds @RequiresApi(Build.VERSION_CODES.UPSIDE_DOWN_CAKE)\nto NetworkStackBpfNetMaps\n\nBug: 328732146\nTest: TH\nChange-Id: Ifa4cffd046164405b8b49d2e2ee9f27240bec6fa\n" }, { "commit": "7bfcd30e899283d53686c38d573c40cc10ce00ff", "tree": "00e2f939145ca4e3dba17405a8e58d79f31d55ba", "parents": [ "d3812614d8822ae5e747af557dc0fd8df27645ea", "fc504042f66ad7eff6adc4e60a0934d0c255a3cd" ], "author": { "name": "Motomu Utsumi", "email": "motomuman@google.com", "time": "Tue Mar 19 04:13:17 2024 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Tue Mar 19 04:13:17 2024 +0000" }, "message": "Merge \"Rename BpfNetMapsReader to NetworkStackBpfNetMaps\" into main" }, { "commit": "fc504042f66ad7eff6adc4e60a0934d0c255a3cd", "tree": "a052ee79df0786f13e2603c69e67cd5c75638a28", "parents": [ "a8e3bfb7df8364092d9a8c4e6a5d587cb70624cb" ], "author": { "name": "Motomu Utsumi", "email": "motomuman@google.com", "time": "Fri Mar 15 18:48:29 2024 +0900" }, "committer": { "name": "Motomu Utsumi", "email": "motomuman@google.com", "time": "Tue Mar 19 04:12:29 2024 +0000" }, "message": "Rename BpfNetMapsReader to NetworkStackBpfNetMaps\n\nBpfNetMapsReader is loaded to bootclasspath. So this class should not\ncontain unnecessary codes.\nTo make this clear, this CL renames to NetowrkStackBpfNetMaps and add\ncomments\n\nBug: 328732146\nTest: TH\nChange-Id: I557627c9fae087eb6119c2ae31d46526fa9e5d7e\n" }, { "commit": "4fcaa4e803d19fee091a97d4dca11d13988580eb", "tree": "b0c3e87c96998dbe59931ab64a0f1197a18df67c", "parents": [ "a8e3bfb7df8364092d9a8c4e6a5d587cb70624cb" ], "author": { "name": "Motomu Utsumi", "email": "motomuman@google.com", "time": "Wed Feb 28 17:15:41 2024 +0900" }, "committer": { "name": "Motomu Utsumi", "email": "motomuman@google.com", "time": "Mon Mar 18 22:16:53 2024 +0900" }, "message": "Use connectivityHandler in CarrierPrivilegeAuthenticator\n\nWhen request_restricted_wifi is enabled CarrierPrivilegeAuthenticator\ncalls CarrierPrivilegesLost callback passed from ConnectivityService.\nBut CarrierPrivilegeAuthenticator was using its own handler thread to\nreceive broadcast and callbacks so CarrierPrivilegesLost callback needed\nto post a message to the CS handler.\nThis CL updates CarrierPrivilegeAuthenticator to use CS handler if\nrequest_restricted_wifi is enabled, and remove the message post in\nConnectivityService.\n\nTest: TH\nChange-Id: Ib41304a30e3dd366b0f6f1d7df81145f0e05ece1\n" }, { "commit": "bbb7828d31f3e05df2aca5dc6137af0b02f82ab6", "tree": "fdc1c27f9bebe461c778ac54ab6c6e5db938e174", "parents": [ "c1df0d07dd7b286d0686db98725c34090b05cc66" ], "author": { "name": "Kangping Dong", "email": "wgtdkp@google.com", "time": "Thu Mar 07 20:45:37 2024 +0800" }, "committer": { "name": "Kangping Dong", "email": "wgtdkp@google.com", "time": "Mon Mar 18 20:13:37 2024 +0800" }, "message": "[Thread] add resourceoverlay config for vendor and model name\n\nPer Thread spec requirement, a Thread BR should optionally publish\nthe vendor and model name in the \"_meshcop._udp\" service.\n\nThis is useful for distinguish a Google or non-Google Thread BR.\n\nBug: 311324956\nChange-Id: Iace5622197914794dd9c9a54f65f63207942b089\n" }, { "commit": "b4772b1e5dd6a58ed9bb1c9e7c6285b608f25472", "tree": "e19ba21636408b460e421b817db8d7fff97d4b11", "parents": [ "a8e3bfb7df8364092d9a8c4e6a5d587cb70624cb" ], "author": { "name": "Motomu Utsumi", "email": "motomuman@google.com", "time": "Mon Oct 23 17:08:27 2023 +0900" }, "committer": { "name": "Motomu Utsumi", "email": "motomuman@google.com", "time": "Fri Mar 15 15:23:50 2024 +0900" }, "message": "Drop packets to VPN address ingressing via non-VPN interface\n\nWhen there are addresses that are used by a single VPN interface,\nConnectivityService sets ingress discard rules to drop packets to this\naddress from the non-Vpn interfaces\n\nTest: FrameworksNetTests\nBug: 295800201\nChange-Id: I089d01a38eff3f37a851627fa9e4acefb8d9ad5e\n" }, { "commit": "a37386a6b67fe0d6e1a3b14411bbe9c2d67c6a1c", "tree": "d5dc7d4ea5723f10b3d025edc43ff67b67489058", "parents": [ "878e1a41e95e31af2218ce5ef515435932d89421", "611b80456aa1990d19c85940ca0dea40565d0cf1" ], "author": { "name": "Ying Xu", "email": "yinxu@google.com", "time": "Thu Mar 14 14:33:38 2024 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Thu Mar 14 14:33:38 2024 +0000" }, "message": "Merge \"Make the subscriptionIds and allowedUids public\" into main" }, { "commit": "4cd5b9e2d2072dda0e508a0b83d901be29e78f49", "tree": "7be57b305e0f9e562feb3806b42b61d11c930caf", "parents": [ "8ee26e64be1ca618f2ec47567a9e0052156f7e2f", "73be9a093380643934a604bf907895348b29ed67" ], "author": { "name": "Chiachang Wang", "email": "chiachangwang@google.com", "time": "Thu Mar 14 06:48:06 2024 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Thu Mar 14 06:48:06 2024 +0000" }, "message": "Merge \"Ignore no permission calls for CaptivePortal.appRequest\" into main" }, { "commit": "73be9a093380643934a604bf907895348b29ed67", "tree": "f626aff940707dd3a5571a52e31e39259e16b9c6", "parents": [ "fee93b0528f08acb5fe32972d12dc6adb8ab9595" ], "author": { "name": "Chiachang Wang", "email": "chiachangwang@google.com", "time": "Wed Mar 13 13:19:04 2024 +0000" }, "committer": { "name": "Chiachang Wang", "email": "chiachangwang@google.com", "time": "Thu Mar 14 04:32:11 2024 +0000" }, "message": "Ignore no permission calls for CaptivePortal.appRequest\n\nThis enforceNetworkStackPermission() should be adopted to check\nthe required permission but this may be break OEM captive portal\napps. Simply ignore the request if the caller does not have\npermission.\n\nThis commit also fixes the format issues that is auto-fixed by\nktlint.\n\nFix: 329385091\nTest: ates FrameworksNetTests\nChange-Id: Ia973a1078eda3134fc8ff261d3954cd050767880\n" }, { "commit": "d2c103ea14e53397cff52bbcc132753ef6960014", "tree": "624782107319e215835e8b8597ccf83283a3772a", "parents": [ "94a79994cd4b60b180eb6acd89b6a67445d7d679", "ad480e0c581421a8e6578b72b6d89f195b6f4590" ], "author": { "name": "Motomu Utsumi", "email": "motomuman@google.com", "time": "Wed Mar 13 02:34:57 2024 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Wed Mar 13 02:34:57 2024 +0000" }, "message": "Merge \"Add CompatChange for local network matching\" into main" }, { "commit": "e08de4d322d2526fbd3c9207506226a315eb63f8", "tree": "d5ca9b9020c772b8eec31723e4f79f2740f83adb", "parents": [ "60414671ecdcd416791c2e60018f0fdefe0c0ee0" ], "author": { "name": "Motomu Utsumi", "email": "motomuman@google.com", "time": "Wed Feb 28 15:58:42 2024 +0900" }, "committer": { "name": "Motomu Utsumi", "email": "motomuman@google.com", "time": "Tue Mar 12 19:07:08 2024 +0900" }, "message": "Fix wrong request_count in connectivityStateSample and add tests\n\nThis CL updates CSTest to use mocked appOpsManager to bypass\ncheckPackage enforcement so that test can file network request as\nSYSTEM_UID\n\nBug: 314627716\nTest: atest ConnectivitySampleMetricsTest\nChange-Id: I0a5f3b1bf2c343644e6f5e2a4ec1b0460e2645c4\n" }, { "commit": "612de50da28c7c78436c98ec92c0685e91b57c3b", "tree": "b88cf04c0e8f03fb140e3719d8ae7621ab8c6e4b", "parents": [ "2aa81a6edcf502de3f1ea21668f24fc36ac29c36", "e45b92cfaa698753eca08731bdb4d7d5cd9807cd" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Thu Mar 07 06:41:03 2024 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Thu Mar 07 06:41:03 2024 +0000" }, "message": "Merge \"Merge Android 14 QPR2 to AOSP main\" into main" }, { "commit": "cf3d20011c486cd4fd4fb8a7e626eb79ee7e1f22", "tree": "68d4956492682d54e82eeda65012aa9a1b88f324", "parents": [ "49fa57ae5829a88271aa5311630b4d3176e818b8" ], "author": { "name": "Maciej Żenczykowski", "email": "maze@google.com", "time": "Tue Mar 05 19:06:30 2024 -0800" }, "committer": { "name": "Maciej Żenczykowski", "email": "maze@google.com", "time": "Tue Mar 05 19:49:20 2024 -0800" }, "message": "Revert \"Log bpf rc file if it differs from the template files.\"\n\nThis reverts commit 41557553f6cd293b0d42d829e34f8380c6b4419a.\n\n(this is no longer needed, as it rolled out with January module,\nwhile the May module this is targetting already includes an rc,\nthus eliminating the need for this warning)\n\nTest: TreeHugger\nSigned-off-by: Maciej Żenczykowski \u003cmaze@google.com\u003e\nChange-Id: I90c8abad2f70d65d142f55c18ad2f34018da6615\n" }, { "commit": "49fa57ae5829a88271aa5311630b4d3176e818b8", "tree": "a6ed50d56ab7c5d15d1c8bbb10e4b0c37d1264b2", "parents": [ "da42fec566cd5ad69586adaca44798835d4fcfff" ], "author": { "name": "Maciej Żenczykowski", "email": "maze@google.com", "time": "Tue Mar 05 19:04:57 2024 -0800" }, "committer": { "name": "Maciej Żenczykowski", "email": "maze@google.com", "time": "Tue Mar 05 19:48:42 2024 -0800" }, "message": "Revert \"Fix BpfLoaderRcUtils to support IOS_8859_1\"\n\nThis reverts commit 71a65dc21b673586bd3cb378a56ac8d3f2af12e6.\n\n(this is no longer needed, as it rolled out with January module,\nwhile the May module this is targetting already includes an rc,\nthus eliminating the need for this warning)\n\nTest: TreeHugger\nSigned-off-by: Maciej Żenczykowski \u003cmaze@google.com\u003e\nChange-Id: I9ea0755fb8e2ae7ec4560f6e0c27ad4e41f5abee\n" }, { "commit": "611b80456aa1990d19c85940ca0dea40565d0cf1", "tree": "808f719f733baaeb62013d7cb2de4eee200eea44", "parents": [ "8c0f67820deb944b6f8b88434e7547bb32ff6227" ], "author": { "name": "Ying Xu", "email": "yinxu@google.com", "time": "Tue Feb 27 10:07:43 2024 -0800" }, "committer": { "name": "Ying Xu", "email": "yinxu@google.com", "time": "Mon Mar 04 14:51:20 2024 -0800" }, "message": "Make the subscriptionIds and allowedUids public\n\nThis CL allows everyone to see the subscriptionIds and the network owner\nto see the allowedUids from the NetworkCapabilities.\n\nBug: 324357121\nTest: atest ConnectivityManagerTest\n atest ConnectivityCoverageTests:android.net.connectivity.com.android.server.ConnectivityServiceTest\nChange-Id: I91e360827d2a9a64625f1d6ae0f808aa327c7d22\n" }, { "commit": "ad480e0c581421a8e6578b72b6d89f195b6f4590", "tree": "03292eec05e5a6c538d50dad20d83879a95880a7", "parents": [ "2b071e919bc7e10078364940f0ac7c1a82005ea5" ], "author": { "name": "Motomu Utsumi", "email": "motomuman@google.com", "time": "Tue Jan 30 16:21:51 2024 +0900" }, "committer": { "name": "Motomu Utsumi", "email": "motomuman@google.com", "time": "Mon Mar 04 17:50:27 2024 +0900" }, "message": "Add CompatChange for local network matching\n\nApps that target an SDK before V will not see networks with\nNET_CAPABILITY_LOCAL_NETWORK unless they explicitly set this capability\nin their network requests.\n\nBug: 319212206\nTest: CSLocalAgentTests\nChange-Id: I414b03dfea9a8aac83304c6be501f03d637739b4\n" }, { "commit": "fd3940589eecca51ece762c599c903078b9813bb", "tree": "e573086d8568a69a99e5745301e64dd27eb7b3d5", "parents": [ "0fda3dd38a29c25b57dbf918ef6a8242a69cc7e5", "e36d77c3855e96c24c590fdeb098721670d165d8" ], "author": { "name": "Maciej Żenczykowski", "email": "maze@google.com", "time": "Mon Mar 04 07:38:21 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Mar 04 07:38:21 2024 +0000" }, "message": "Revert \"24Q2: use mainline netbpfload from apex\" am: e36d77c385\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2986117\n\nChange-Id: I97c08b3743925b114b85bef510cd90afbb92ca96\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "0fda3dd38a29c25b57dbf918ef6a8242a69cc7e5", "tree": "4ba8d0caae9d170a3b043cbcfbda0ffcdf8c1dfe", "parents": [ "8a7c9f6c5fc82afa083334b9eb227606c0e41d33", "13b5e1ff296789016a4b82f444cbc10a28000995" ], "author": { "name": "Maciej Żenczykowski", "email": "maze@google.com", "time": "Mon Mar 04 07:38:07 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Mar 04 07:38:07 2024 +0000" }, "message": "24Q2: use mainline netbpfload from apex am: 13b5e1ff29\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2954707\n\nChange-Id: Iddf496b3c2f9bddc8baa43facfffbe5c96bfc8a9\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "e36d77c3855e96c24c590fdeb098721670d165d8", "tree": "884aea79080d4d66b1c25ff6cb84d3568b63ae09", "parents": [ "13b5e1ff296789016a4b82f444cbc10a28000995" ], "author": { "name": "Maciej Żenczykowski", "email": "maze@google.com", "time": "Mon Mar 04 06:59:25 2024 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Mon Mar 04 06:59:25 2024 +0000" }, "message": "Revert \"24Q2: use mainline netbpfload from apex\"\n\nThis reverts commit 13b5e1ff296789016a4b82f444cbc10a28000995.\n\nReason for revert: wasn\u0027t sent for review\n\nChange-Id: Ibbf514e0ce506e2720f3d98f12beab7c4d14e133\n" }, { "commit": "13b5e1ff296789016a4b82f444cbc10a28000995", "tree": "3e2d6f95dc6ca9ce1b1a72ec8be6e73968099cd5", "parents": [ "2154e525b3395f6a0307da5991b5e92c5bf085e9" ], "author": { "name": "Maciej Żenczykowski", "email": "maze@google.com", "time": "Wed Feb 07 00:43:25 2024 +0000" }, "committer": { "name": "Maciej Żenczykowski", "email": "maze@google.com", "time": "Mon Mar 04 06:32:18 2024 +0000" }, "message": "24Q2: use mainline netbpfload from apex\n\n(also monitor https://pitot.corp.google.com/clusters?release\u003dpublic-all\u0026comparison\u003dtarget\u0026device_view\u003dALL_DEVICES\u0026duration\u003d56\u0026clusters.search\u003dBpfLoaderRcUtils )\n\nSee also:\n https://android-review.git.corp.google.com/c/platform/packages/modules/Connectivity/+/2956635\n netbpfload: enable on U QPR2 (aka 24Q1) [target May mainline]\n\nTest: TreeHugger, atest FrameworksNetTests:android.net.connectivity.com.android.server.BpfLoaderRcUtilsTest\nSigned-off-by: Maciej Żenczykowski \u003cmaze@google.com\u003e\nChange-Id: Ie9e0f90321265f33a23deb03b403fb73b6a1db05\n" }, { "commit": "e5a99273a8fd9038bc5714781f6293fd5ad65a8e", "tree": "34664d72b521c4fe1fe3e1cb28a6b588eec02319", "parents": [ "daf0691e75534e67d98d6d0352b8c0e7b914f82a", "db67a80430f0a3836900345a3b3515b3bdce0705" ], "author": { "name": "Yang Sun", "email": "sunytt@google.com", "time": "Thu Feb 29 03:34:05 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Feb 29 03:34:05 2024 +0000" }, "message": "Merge \"Include structs lib in service-connectivity-pre-jarjar\" into main am: db67a80430\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2966917\n\nChange-Id: I5021d8019cdf6685c86fa9ce9ee9279474065629\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "db67a80430f0a3836900345a3b3515b3bdce0705", "tree": "f032f85e66e16bf403d336e98649dbcb5cae9979", "parents": [ "745dc316bf53bb1091f79613006c342a379f3887", "1c9fb59004974701c529baee54b2bb8044ce5da9" ], "author": { "name": "Yang Sun", "email": "sunytt@google.com", "time": "Thu Feb 29 03:16:28 2024 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Thu Feb 29 03:16:28 2024 +0000" }, "message": "Merge \"Include structs lib in service-connectivity-pre-jarjar\" into main" }, { "commit": "19a5a97420efa3780303af79c4f00acd55755933", "tree": "87f2ea7e21023960a9bb4c1b6d41f13c42a89860", "parents": [ "935f56835194faa748aeae5716fe3205f516e58f", "5ce2519a3e896cc6b9c85c8e69728bb3aff3e821" ], "author": { "name": "Kangping Dong", "email": "wgtdkp@google.com", "time": "Wed Feb 28 16:40:29 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Feb 28 16:40:29 2024 +0000" }, "message": "Merge \"[Thread] make Thread state customisable via resource overlay\" into main am: 5ce2519a3e\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2916726\n\nChange-Id: I245ca692066f3d206f402851c5688997267bb888\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "c8359f4eb11d5583413aeedd813509e46e856739", "tree": "1ebbd8a5101df3e66f563b756cb0f6b202febef6", "parents": [ "22074a3efaba0ce10d09a22c6d32c4028b28ffdc" ], "author": { "name": "Kangping Dong", "email": "wgtdkp@google.com", "time": "Mon Jan 29 12:10:54 2024 +0800" }, "committer": { "name": "Kangping Dong", "email": "wgtdkp@google.com", "time": "Wed Feb 28 16:54:02 2024 +0800" }, "message": "[Thread] make Thread state customisable via resource overlay\n\nMake the default Thread and Border Router enabled state customizable for\nvendor via resource overlay.\n\nBug: 322734489\nChange-Id: I278d6afa82aac8d1bb06ee79f22bae6fb0199386\n" }, { "commit": "bc55087fc2938d364ff424ad998b98248ac97dc2", "tree": "fae20156a7835ebf9c80b2c13b5377143dfc4f64", "parents": [ "e23cffc52914880887f6f7fd2e390de320b18864", "63ff28ed54dd4eb2b5f9d96ffb6c171bf84b359f" ], "author": { "name": "Nagendra Prasad Nagarle Basavaraju", "email": "nagendranb@google.com", "time": "Mon Feb 26 17:22:44 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Feb 26 17:22:44 2024 +0000" }, "message": "Merge \"SatelliteAccessController enhancements to handle Multiple User\" into main am: 63ff28ed54\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2954926\n\nChange-Id: Ic696199bfc6996d3a92a42deb76380e3421087cc\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "63ff28ed54dd4eb2b5f9d96ffb6c171bf84b359f", "tree": "53fe1535ab42dc0af55f273ef36f11b2fda001fe", "parents": [ "a3c94d52738178c858a0caecb24474ce37dc3488", "f63e6d8e67f52acf35c3d3c0177dad485ceb2880" ], "author": { "name": "Nagendra Prasad Nagarle Basavaraju", "email": "nagendranb@google.com", "time": "Mon Feb 26 16:44:08 2024 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Mon Feb 26 16:44:08 2024 +0000" }, "message": "Merge \"SatelliteAccessController enhancements to handle Multiple User\" into main" }, { "commit": "f63e6d8e67f52acf35c3d3c0177dad485ceb2880", "tree": "ecea44d051201e19c82860963d6e543f2c7790c5", "parents": [ "e521ae306aa96e142ffa325f40df2c233591f53a" ], "author": { "name": "Nagendra Prasad Nagarle Basavaraju", "email": "nagendranb@google.com", "time": "Thu Feb 08 09:06:22 2024 +0000" }, "committer": { "name": "Nagendra Prasad Nagarle Basavaraju", "email": "nagendranb@google.com", "time": "Mon Feb 26 11:24:01 2024 +0000" }, "message": "SatelliteAccessController enhancements to handle Multiple User\n\n- onRoleHoldersChanged \u0026 onRoleSmsChanged handling for multiple Users\n- Different satelliteNetworkFallbackUids cache for each user.\n- Merging uid of each user cache and sending for Multi Layer request\n- check SATELLITE_COMMUNICATION permission based package manager\n context at different UserHandle\n\nBug: 324347502\nTest: atest FrameworksNetTests\nChange-Id: If98524ec7846909d70db3e962e2a11c912768551\n" }, { "commit": "1c9fb59004974701c529baee54b2bb8044ce5da9", "tree": "5eb6d62e8c822d1138f1005a9c1ff503e932fd21", "parents": [ "b8ad2428d0e435d923e4c70163b4a31cae106fca" ], "author": { "name": "Yang Sun", "email": "sunytt@google.com", "time": "Mon Feb 19 10:37:26 2024 +0800" }, "committer": { "name": "Yang Sun", "email": "sunytt@google.com", "time": "Mon Feb 26 17:28:04 2024 +0800" }, "message": "Include structs lib in service-connectivity-pre-jarjar\n\nTo use the java struct definitions for multicast routing in connectivity\nservice, a new lib is defined and included in\nservice-connectivity-pre-jarjar.\n\nBug: 323503345\n\nTest: presubmit\nChange-Id: I664602fd0fa0a5da136ea28fd3c4d9068c5b46ab\n" }, { "commit": "95535381695e92935e08b3c097b9ed4a63c3ab67", "tree": "f54e7ad72fc1358ad33d1e93cc8d06962abe4512", "parents": [ "2acee58a780719efc8a0a5156e64535c21a1dc97", "c91b22be98baa4e7f641055da20adbf0546e8460" ], "author": { "name": "Chiachang Wang", "email": "chiachangwang@google.com", "time": "Mon Feb 26 06:31:35 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Feb 26 06:31:35 2024 +0000" }, "message": "Merge \"Correct the method used for permission check\" into main am: c91b22be98\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2950126\n\nChange-Id: I06a492a0299277a3d16e37b122bd28f3f5b85bc0\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "ac162f2272c83a23a03587507ed552c9453a3118", "tree": "61665d4b41474bab0ae19332f7c927620f4873eb", "parents": [ "82b6839c02e7f3bc63bd8a6710db4e6dd7988ef2" ], "author": { "name": "Chiachang Wang", "email": "chiachangwang@google.com", "time": "Mon Feb 05 06:52:06 2024 +0000" }, "committer": { "name": "Chiachang Wang", "email": "chiachangwang@google.com", "time": "Mon Feb 26 03:08:22 2024 +0000" }, "message": "Correct the method used for permission check\n\nThe hasNetworkStackPermission() method does not enfore the\npermission check. It should be replaced with\nenforceNetworkStackPermission().\n\nBug: 325984919\nTest: atest FrameworksNetTests\nChange-Id: I9ad0b47190dbc9afd2ee6f5dfc21a4935036733a\n" }, { "commit": "7d5d380a366f7031ca4243bbc02d859d4818be52", "tree": "1f9ca995114f5058806d93aa8ee6acd14f6b10e6", "parents": [ "4dc8f989b8dc952d9a48e345a3e4ac867b40bf94", "9a5aaaccf6ba6c39063bb9c76cafd923977593bd" ], "author": { "name": "Ying Xu", "email": "yinxu@google.com", "time": "Tue Feb 20 22:21:32 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Feb 20 22:21:32 2024 +0000" }, "message": "Merge \"Store the SubscriptionId together with the Carrier UID\" into main am: 9a5aaaccf6\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2956897\n\nChange-Id: Id58458b8523d74d70ee2a9a2ed93195949c8a253\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "0d06b9460a76e66ce69f8ea3ec309a4a688f8559", "tree": "f920bc6b7c998b5879a7e7a4d0ee1ea3e4c9a7e9", "parents": [ "a65d8f3a4c31f07a7089acdf233fb0ce8eb071aa" ], "author": { "name": "Ying Xu", "email": "yinxu@google.com", "time": "Fri Feb 09 21:04:08 2024 -0800" }, "committer": { "name": "Ying Xu", "email": "yinxu@google.com", "time": "Tue Feb 20 08:58:31 2024 -0800" }, "message": "Store the SubscriptionId together with the Carrier UID\n\nAlways store the corresponding SubscriptionId together with the Carrier\nuid so that when the carrier loses the Privilege, both the uid and\nSubscriptionID will be used in the onCarrierPrivilegesLost callback\n\nBug: 324357121\nTest: atest ConnectivityCoverageTests:android.net.connectivity.com.android.server.connectivity.CarrierPrivilegeAuthenticatorTest\n atest ConnectivityCoverageTests:android.net.connectivity.com.android.server.ConnectivityServiceTest\nChange-Id: I28e51c583261a67d4441c6f825ade6781b862ee4\n" }, { "commit": "ee1d1b86d60f370f5b89ee62ccc0767d41449db2", "tree": "1a465fa06182e811885fec8322086ec6ce2bc695", "parents": [ "9f63dd7e7f9ead283921043ac263aab2dcaf321c", "8960842e6a48d471d730b5de0ad0155df4c9bbab" ], "author": { "name": "Motomu Utsumi", "email": "motomuman@google.com", "time": "Tue Feb 13 08:46:32 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Feb 13 08:46:32 2024 +0000" }, "message": "Merge \"Enable CloseFrozenAppSockets feature on V+\" into main am: 8960842e6a\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2960502\n\nChange-Id: I73b8ebec6843cbb67c03813dbef2a27301b3ab90\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "8960842e6a48d471d730b5de0ad0155df4c9bbab", "tree": "8518b2338b19da54b470659f4b0e4b6ecbdcc070", "parents": [ "13a0cc04f642e50736b67863a03cc86c4a87fd58", "701efffe238a1e9eb40679435fb0875b3eff717a" ], "author": { "name": "Motomu Utsumi", "email": "motomuman@google.com", "time": "Tue Feb 13 07:37:10 2024 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Tue Feb 13 07:37:10 2024 +0000" }, "message": "Merge \"Enable CloseFrozenAppSockets feature on V+\" into main" }, { "commit": "701efffe238a1e9eb40679435fb0875b3eff717a", "tree": "cfd5f6e331e1dfbdd375d7e63f0beba039340b9a", "parents": [ "901db13423b8d260d12e2f40fa15e0878af4e4f6" ], "author": { "name": "Motomu Utsumi", "email": "motomuman@google.com", "time": "Tue Feb 13 12:46:59 2024 +0900" }, "committer": { "name": "Motomu Utsumi", "email": "motomuman@google.com", "time": "Tue Feb 13 12:46:59 2024 +0900" }, "message": "Enable CloseFrozenAppSockets feature on V+\n\nOn V, this feature is enabled on all devices.\nOn U, this feature is enabled if the flag is enabled.\n\nTest: TH\nChange-Id: I025b9a8098a0896be51cf06c5b8262243ba439b7\n" }, { "commit": "148871dcf2069139c9bc6ede3457095b93b187a0", "tree": "15d89953ac7ab8135f0695060f03f35b0b534847", "parents": [ "ced97b9b0e5d352c026b2fed3e9705a02f249d3f", "33368641aef20fbc14daac2c23d90de959694ea7" ], "author": { "name": "Maciej Żenczykowski", "email": "maze@google.com", "time": "Sun Feb 11 04:49:05 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Sun Feb 11 04:49:05 2024 +0000" }, "message": "Merge \"Shell commands to tweak uid rules on FIREWALL_CHAIN_BACKGROUND\" into main am: 33368641ae\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2956011\n\nChange-Id: Ia62826bc1adc86d9006b9da8a2d4a131f164d1c9\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "33368641aef20fbc14daac2c23d90de959694ea7", "tree": "63923ef36240cedaf57c4b26608a610ae319d3fa", "parents": [ "2fe0abc95c25c8150c40be8ae6d879eac56cbb64", "22ea166bbc3e6a73212b96b23bf291515e4ae2c1" ], "author": { "name": "Maciej Żenczykowski", "email": "maze@google.com", "time": "Sun Feb 11 04:22:33 2024 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Sun Feb 11 04:22:33 2024 +0000" }, "message": "Merge \"Shell commands to tweak uid rules on FIREWALL_CHAIN_BACKGROUND\" into main" }, { "commit": "22ea166bbc3e6a73212b96b23bf291515e4ae2c1", "tree": "b6aa59230d4acef976b6ecc92951ca7c2bc6cf91", "parents": [ "901db13423b8d260d12e2f40fa15e0878af4e4f6" ], "author": { "name": "Suprabh Shukla", "email": "suprabh@google.com", "time": "Thu Feb 08 16:06:01 2024 -0800" }, "committer": { "name": "Suprabh Shukla", "email": "suprabh@google.com", "time": "Fri Feb 09 16:35:59 2024 -0800" }, "message": "Shell commands to tweak uid rules on FIREWALL_CHAIN_BACKGROUND\n\nThese can be used by manual or automated tests.\n\nTest: Manual by using the `cmd connectivity` shell commands\nTest: atest CtsNetTestCases:ConnectivityManagerTest\nTest: atest netd_integration_test\n\nBug: 322562125\nChange-Id: I1de55e430141f566e510b37554a9416c4444213b\n" }, { "commit": "670d0b172f1d78166072a24e42acf04ccfda89a8", "tree": "e0f1caef1c81ed336753243c571d1c050f2177f7", "parents": [ "2a1a9568736043ba551f2f0d84fa21e71ffb7647", "b19fd5414b4cd38d8c2da834bfc71ea0a07bcf2f" ], "author": { "name": "Cole Faust", "email": "colefaust@google.com", "time": "Thu Feb 08 06:35:19 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Feb 08 06:35:19 2024 +0000" }, "message": "Merge \"Prepare for @RequiresApi class retention\" into main am: b19fd5414b\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2946926\n\nChange-Id: Ia712a91254eb9162d4bf502cc3612cac4326b12c\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "b19fd5414b4cd38d8c2da834bfc71ea0a07bcf2f", "tree": "7717a0d75b9c0e320b9c6289169acb63f8db1c2b", "parents": [ "901db13423b8d260d12e2f40fa15e0878af4e4f6", "53da9ac34c8093096f7e2c87e63618ca3f19dac3" ], "author": { "name": "Cole Faust", "email": "colefaust@google.com", "time": "Thu Feb 08 06:18:10 2024 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Thu Feb 08 06:18:10 2024 +0000" }, "message": "Merge \"Prepare for @RequiresApi class retention\" into main" }, { "commit": "efc6ab3a122be042662d09319853e4cee4805350", "tree": "f14abfa8b4e2110d8a9e3121ab983f66bd8eff47", "parents": [ "852739817886ecd41396a232990d810bcfef35c6", "804aa2326d46f4c76db17d8c89cea58ed5f367a2" ], "author": { "name": "Nagendra Prasad Nagarle Basavaraju", "email": "nagendranb@google.com", "time": "Wed Feb 07 19:40:49 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Feb 07 19:40:49 2024 +0000" }, "message": "Support Satellite Network Preferred uid\u0027s multi layer request am: 804aa2326d\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2940525\n\nChange-Id: Icdf081cc8be09db2d565c71df2c076fc51b76f7b\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "852739817886ecd41396a232990d810bcfef35c6", "tree": "5fac07f9a83a5c91f462e72956d6945f0cb0c62f", "parents": [ "656a3a3d5547db4024367dda1d3b2427b437d92e", "33c7da366181531f60d11ab8447b4b09d407c2c1" ], "author": { "name": "Nagendra Prasad Nagarle Basavaraju", "email": "nagendranb@google.com", "time": "Wed Feb 07 19:40:45 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Feb 07 19:40:45 2024 +0000" }, "message": "Add SatelliteAccessController class to support messaging on Satellite Internet am: 33c7da3661\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2939960\n\nChange-Id: If8bd3b19cc92d535d0b0c54a4af02a16cfd869fa\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "656a3a3d5547db4024367dda1d3b2427b437d92e", "tree": "b8f35df490e064fd11dea9f18a5fc3233bf80bce", "parents": [ "8a3f368be7f9d9a8d76fb6de8a86b44421a02e74", "1fa6f09019a78f4c2f26c47673a6328df76104a7" ], "author": { "name": "Nagendra Prasad Nagarle Basavaraju", "email": "nagendranb@google.com", "time": "Wed Feb 07 19:40:29 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Feb 07 19:40:29 2024 +0000" }, "message": "add TRANSPORT_SATELLITE to NetworkCapabilities am: 1fa6f09019\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2940285\n\nChange-Id: I6eb9f38409f77bcec70f5a491b98fb988864d58c\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "804aa2326d46f4c76db17d8c89cea58ed5f367a2", "tree": "90ef7af8b80e7ee4b421973d4d71d5dae087d2b2", "parents": [ "33c7da366181531f60d11ab8447b4b09d407c2c1" ], "author": { "name": "Nagendra Prasad Nagarle Basavaraju", "email": "nagendranb@google.com", "time": "Wed Jan 31 15:35:31 2024 +0000" }, "committer": { "name": "Nagendra Prasad Nagarle Basavaraju", "email": "nagendranb@google.com", "time": "Wed Feb 07 16:16:42 2024 +0000" }, "message": "Support Satellite Network Preferred uid\u0027s multi layer request\n\n- Implement handleSetSatelliteNetworkPreference() at ConnectivityService\n to create multi layer request with preference order\n PREFERENCE_ORDER_SATELLITE_FALLBACK.\n- unit test coverage\n\nBug: 320514105\nTest: m and atest FrameworksNetTests\nChange-Id: I3f71104f8c3c998599eaab71ae4076985f4bed77\n" }, { "commit": "33c7da366181531f60d11ab8447b4b09d407c2c1", "tree": "8251bc31daaadb504a5f71bea064a86781233566", "parents": [ "1fa6f09019a78f4c2f26c47673a6328df76104a7" ], "author": { "name": "Nagendra Prasad Nagarle Basavaraju", "email": "nagendranb@google.com", "time": "Wed Jan 31 15:10:45 2024 +0000" }, "committer": { "name": "Nagendra Prasad Nagarle Basavaraju", "email": "nagendranb@google.com", "time": "Wed Feb 07 16:10:20 2024 +0000" }, "message": "Add SatelliteAccessController class to support messaging on Satellite Internet\n\n- create SatelliteAccessController class to identify role sms and\n satellite communication enabled uid\u0027s, to keep track of role changes\n through OnRoleHoldersChangedListener and to request to create\n multi layer request to ConnectivityService.\n- unit test coverage\n\nBug: 320514105\nTest: m and atest FrameworksNetTests\nChange-Id: I95086f7a4fd6fe1261f432e605d792204ff5310b\n" }, { "commit": "1fa6f09019a78f4c2f26c47673a6328df76104a7", "tree": "987e26a67bdaf45ca19cf65d2ee08ebbebd97606", "parents": [ "7cabd32bc5a761a0374e5220fae91e2653efaa09" ], "author": { "name": "Nagendra Prasad Nagarle Basavaraju", "email": "nagendranb@google.com", "time": "Wed Jan 31 13:39:15 2024 +0000" }, "committer": { "name": "Nagendra Prasad Nagarle Basavaraju", "email": "nagendranb@google.com", "time": "Wed Feb 07 16:07:39 2024 +0000" }, "message": "add TRANSPORT_SATELLITE to NetworkCapabilities\n\nThis commit also updates to use V14 dnsresolver APIs which was V13.\n\nBug: 320514105\nTest: m \u0026 atest FrameworksNetTests\nChange-Id: I6e92f4d99e0eba3b5d1d5e45bf11e5e945ea43f1\n" }, { "commit": "8a3f368be7f9d9a8d76fb6de8a86b44421a02e74", "tree": "1b7ef322f4fb6f09f3a56a816ecbbff6ec60aa5e", "parents": [ "ad5b471b4fb958aecf328fed3b41be02d0d98435", "7cabd32bc5a761a0374e5220fae91e2653efaa09" ], "author": { "name": "Ying Xu", "email": "yinxu@google.com", "time": "Wed Feb 07 16:05:31 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Feb 07 16:05:31 2024 +0000" }, "message": "Support bringing up restricted wifi am: 7cabd32bc5\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2917645\n\nChange-Id: Id237ef42aec76d380a3d0d400a9a7943364de154\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "7cabd32bc5a761a0374e5220fae91e2653efaa09", "tree": "788b3618a7f46d6ed507f94213da6011c5203453", "parents": [ "54aaccc1c9d4c05d2dccc25cdd7fca07f0b7729e" ], "author": { "name": "Ying Xu", "email": "yinxu@google.com", "time": "Mon Jan 15 18:40:15 2024 -0800" }, "committer": { "name": "Ying Xu", "email": "yinxu@google.com", "time": "Wed Feb 07 04:24:38 2024 -0800" }, "message": "Support bringing up restricted wifi\n\nThis CL allows the Carrier Config app to request restricted WiFi nework\nby setting the correspoding subscription ID in the network request.\n\nBug: 315835605\nTest: atest android.net.cts.NetworkRequestTest\n atest ConnectivityCoverageTests:android.net.connectivity.com.android.server.connectivity.CarrierPrivilegeAuthenticatorTest\n atest ConnectivityCoverageTests:android.net.connectivity.com.android.server.ConnectivityServiceTest\n\nChange-Id: I237e692d092ff5f969ce4b7962f6d58099a6f3a9\n" }, { "commit": "53da9ac34c8093096f7e2c87e63618ca3f19dac3", "tree": "402c128cb01aeeb912c2ef5ecadf2deaa1f09f8e", "parents": [ "1042c175a076fcfe0d1699ad3f7544dadf6492ad" ], "author": { "name": "Cole Faust", "email": "colefaust@google.com", "time": "Thu Feb 01 16:57:31 2024 -0800" }, "committer": { "name": "Cole Faust", "email": "colefaust@google.com", "time": "Fri Feb 02 12:04:05 2024 -0800" }, "message": "Prepare for @RequiresApi class retention\n\nThe android framework has android.annotation.RequiresApi, which is a\ncopy of androidx.annotation.RequiresApi. However it was added with\nsource retention instead of class retention like androidx\u0027s version\nhas. This causes it to be missed if you compiled a library and then\nused that library to compile something else, that library\u0027s public\nmethods won\u0027t have @RequiresApi on them when using that library\u0027s\ncompiled jar file.\n\nTo make @RequiresApi have class retention, we need to baseline the\nNewApi issues that it would cause. These baselines also require\nus to disable strict_updatability_linting in some places.\n\nBug: 323366771\nTest: m lint-check\nChange-Id: I0c984e3ba39e357ce102be442568f2d77a4f9034\n" }, { "commit": "5af49dc5ac3e4b9829412c593c5bc43f9cc07dce", "tree": "b872212d681a5ed7dd282a57af374b18fea941b3", "parents": [ "482974794648fb5038e791c31343527b5a830793", "1042c175a076fcfe0d1699ad3f7544dadf6492ad" ], "author": { "name": "Cole Faust", "email": "colefaust@google.com", "time": "Fri Feb 02 19:10:18 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Feb 02 19:10:18 2024 +0000" }, "message": "Merge \"Remove strict_updatability_linting: true\" into main am: 1042c175a0\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2927772\n\nChange-Id: Ic0832c9ccba9706834124be3bf1f21dc9cf5ad5b\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "1042c175a076fcfe0d1699ad3f7544dadf6492ad", "tree": "d335852fb5c9b3025c7e1a70de84c5671a9c826f", "parents": [ "ef58a8a33a873e90bac4cb63e7c502da216e0b4f", "ee56c432e0307604495c7a2bddfbf5eeba4787ba" ], "author": { "name": "Cole Faust", "email": "colefaust@google.com", "time": "Fri Feb 02 18:21:10 2024 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Fri Feb 02 18:21:10 2024 +0000" }, "message": "Merge \"Remove strict_updatability_linting: true\" into main" }, { "commit": "482974794648fb5038e791c31343527b5a830793", "tree": "e716d01299c6b46468a997afffb915b384236fa7", "parents": [ "5d679377d40346d9f285bd2d4a5271b80ab38d5c", "ef58a8a33a873e90bac4cb63e7c502da216e0b4f" ], "author": { "name": "Junyu Lai", "email": "junyulai@google.com", "time": "Fri Feb 02 07:43:59 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Feb 02 07:43:59 2024 +0000" }, "message": "Merge \"Rename check*Permission* to has*Permission\" into main am: ef58a8a33a\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2942985\n\nChange-Id: Iccc4355f5581f839aac4cbbfa8ec28c02f1ee439\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "ef58a8a33a873e90bac4cb63e7c502da216e0b4f", "tree": "4f5cb4ce26ac4bdb9e6dc6e5961458f0a49694fd", "parents": [ "84cc4e507e6771ab7df39aa53bff52b14df73d2d", "71b51538982673feca0913ba9325a47869f9694c" ], "author": { "name": "Junyu Lai", "email": "junyulai@google.com", "time": "Fri Feb 02 07:07:31 2024 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Fri Feb 02 07:07:31 2024 +0000" }, "message": "Merge \"Rename check*Permission* to has*Permission\" into main" }, { "commit": "5d679377d40346d9f285bd2d4a5271b80ab38d5c", "tree": "bdbf3d66739e2a106feb376d166683efebd49d9b", "parents": [ "37dc83c272736ed07992be429a0e810605400b8b", "84cc4e507e6771ab7df39aa53bff52b14df73d2d" ], "author": { "name": "Hansen Kurli", "email": "hkurli@google.com", "time": "Fri Feb 02 05:56:24 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Feb 02 05:56:24 2024 +0000" }, "message": "Merge \"Increase max metrics duration deviation to 2 hours\" into main am: 84cc4e507e\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2939460\n\nChange-Id: I20bb3cc39f1059aa03a37863837dbe42a37bfc4a\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "84cc4e507e6771ab7df39aa53bff52b14df73d2d", "tree": "77d503941fe47feffdb3ea34eda3cb5112ec217c", "parents": [ "fbaa7ea0bc5375a83b1a187effd9ee3f8f6884be", "d85482534cae50b2dc3911f32b39ee8f2cd27d08" ], "author": { "name": "Hansen Kurli", "email": "hkurli@google.com", "time": "Fri Feb 02 05:29:54 2024 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Fri Feb 02 05:29:54 2024 +0000" }, "message": "Merge \"Increase max metrics duration deviation to 2 hours\" into main" }, { "commit": "71b51538982673feca0913ba9325a47869f9694c", "tree": "6dce7ea5879298c1ab6b370df0c1e83f1d67999c", "parents": [ "d7773093eeec02804aa0992a8ecbd2cca12f227c" ], "author": { "name": "Junyu Lai", "email": "junyulai@google.com", "time": "Thu Feb 01 10:39:01 2024 +0800" }, "committer": { "name": "Junyu Lai", "email": "junyulai@google.com", "time": "Thu Feb 01 15:24:35 2024 +0800" }, "message": "Rename check*Permission* to has*Permission\n\nThe check*Permission methods are a bit error-prone because people\ncan forget to check the return value and expect that they behave\nlike the enforce* methods. This was pointed out before in some bugs.\n\nThis change adds @CheckResult annotation to enforce linter warning\nand rename methods accordingly.\n\nTest: TH\nFix: 279691948\nChange-Id: Ibb0df6540fe0ed40289bb190b790130daaa2f763\n" }, { "commit": "612ba174b881c37e5677ab398c8235930fe1a426", "tree": "659a074a3d0c5b6b77a7b7437d9abffae9952beb", "parents": [ "49952fd0b966dec74eb2314a1e77f82e6f07485d", "e7aa45cdf06a01e5bd28834d5a8749b918f0b1e6" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Thu Feb 01 00:08:24 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Feb 01 00:08:24 2024 +0000" }, "message": "Merge \"[DON\u0027T BLOCK] Test ownership migration rules\" into main am: e7aa45cdf0\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2939819\n\nChange-Id: I44d0250070a365ebea03b46cd1dbefa73f48ef51\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "01b5ede2b2f30a5fc2b86b4acabfeec20f3c683e", "tree": "4f489cecd57cee5df30b12787bf22a6fce4eb44a", "parents": [ "a906743bc7ff42c1cc4f5d2d9b501034fd7bff65" ], "author": { "name": "Aditya Choudhary", "email": "caditya@google.com", "time": "Wed Jan 31 11:08:57 2024 +0000" }, "committer": { "name": "Aditya Choudhary", "email": "caditya@google.com", "time": "Wed Jan 31 12:34:50 2024 +0000" }, "message": "[DON\u0027T BLOCK] Test ownership migration rules\n\nThis CL is created as a best effort to migrate test targets\nto the new android ownership model. If you find incorrect or unnecessary\nattribution in this CL, please create a separate CL to fix that.\n\nFor more details please refer to the link below,\n\u003cadd g3 doc link\u003e\n\nBug: 304529413\nTest: N/A\nChange-Id: I243f17b3f0ad7af9ffa15ca242456e36688733f5\nMerged-In: I243f17b3f0ad7af9ffa15ca242456e36688733f5\n" }, { "commit": "d85482534cae50b2dc3911f32b39ee8f2cd27d08", "tree": "2e3a922f389ab78b6efe754c4616825f54cb2276", "parents": [ "ad93a191e789449c6891b6728f1ef36a6b366d3b" ], "author": { "name": "Hansen Kurli", "email": "hkurli@google.com", "time": "Tue Jan 30 20:41:13 2024 +0800" }, "committer": { "name": "Hansen Kurli", "email": "hkurli@google.com", "time": "Wed Jan 31 20:09:27 2024 +0800" }, "message": "Increase max metrics duration deviation to 2 hours\n\nA lot of WTF logs reported were barely 1 second over the 1 hour\nlimit. AlarmManager has a maximum window of 1 hour so these cases\nare possible and expected.\nIncrease the max metrics duration deviation to 2 hours to avoid\nthis log.\n\nBug: 297292877\nTest: Manual test\nChange-Id: I9a476e8061944c6499fe1b1d6e9ad1e19e6ce2b9\n" }, { "commit": "0d0b075a3a53b665a0314a34c05cfba52395e8bf", "tree": "7656ef383e2f284fefe5201d7299ac40fb5ea7e1", "parents": [ "916300144fdd16a44e54718152fd909f368099e5", "cf2c5141ccafb37c10ca20998b6c95881692d85b" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Tue Jan 30 10:38:09 2024 -0800" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Tue Jan 30 10:38:09 2024 -0800" }, "message": "Merge Android 24Q1 Release (ab/11220357)\n\nBug: 319669529\nMerged-In: Iaaca422cb105c00ded1d84b40afd745abcd651b7\nChange-Id: I4328f5086dfde8c49e4352895663cc7abccab7fa\n" }, { "commit": "96361bc4cdf3806848828aee564adbc83a2c4872", "tree": "7430cf524409a6c51a0b1b423bd2218cacea349f", "parents": [ "57ead48b11cb06af3b63352a287cccbe0f82b4f3", "cca941a2329ce331436bf0c4afb710ab2b27fddd" ], "author": { "name": "Handa Wang", "email": "handaw@google.com", "time": "Tue Jan 30 09:03:34 2024 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Tue Jan 30 09:03:34 2024 +0000" }, "message": "Merge \"Move the Thread proguard flags to ConnectivityService\u0027s proguard.flags\" into main" }, { "commit": "1af39c0a47a7cc05b72304e9f2c1e5bfd5f74fdd", "tree": "3fb9bb49e37078d5079e687b2cd0a4dbb95507ce", "parents": [ "7412936a8cb66ce025b32db066fe294ad6d06be3", "3d41ab69e87f6f20ee701d96350729cd2c60f63f" ], "author": { "name": "Kangping Dong", "email": "wgtdkp@google.com", "time": "Mon Jan 29 11:50:23 2024 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Mon Jan 29 11:50:23 2024 +0000" }, "message": "Merge \"[OWNERS] add Thread team to config resource OWNERS\" into main" }, { "commit": "3d41ab69e87f6f20ee701d96350729cd2c60f63f", "tree": "39929adc662ea30577ee4f9eefd7366296d9df71", "parents": [ "ad93a191e789449c6891b6728f1ef36a6b366d3b" ], "author": { "name": "Kangping Dong", "email": "wgtdkp@google.com", "time": "Fri Jan 19 10:34:10 2024 +0800" }, "committer": { "name": "Kangping Dong", "email": "wgtdkp@google.com", "time": "Mon Jan 29 16:43:35 2024 +0800" }, "message": "[OWNERS] add Thread team to config resource OWNERS\n\nBug: 322734489\nChange-Id: I9f6c781513a749c9e3953e8bad85b5ebaad776fa\n" }, { "commit": "cca941a2329ce331436bf0c4afb710ab2b27fddd", "tree": "420096c8ba85e85c8c4f44f67764ef1107b4b355", "parents": [ "61fba508f802e76a382cccdd90ee353976269ea6" ], "author": { "name": "Handa Wang", "email": "handaw@google.com", "time": "Thu Jan 25 11:03:12 2024 +0000" }, "committer": { "name": "Handa Wang", "email": "handaw@google.com", "time": "Fri Jan 26 09:14:53 2024 +0000" }, "message": "Move the Thread proguard flags to ConnectivityService\u0027s proguard.flags\n\nWe needed this proguard flag because\nThreadNetworkService#onLocalNetworkInfoChanged will otherwise be\nstripped. We need to keep the method to ensure the border routing\nfeature works.\n\nInitially we put the flag in thread/service/proguard.flags. However,\nthis seems not working on udc-mainline-prod branch. After moving it to\nConnectivity/service/proguard.flags, it works as desired.\n\nBug: 313539492\n\nChange-Id: I33cb0602095a617dbb1cfe3d9002f9c68e93cccf\n" }, { "commit": "0d450d3e4df2cfe18a4b66cbcb8b610d8800acd6", "tree": "d6b8492062924e2e1f16c5790f8eab4ca32b714a", "parents": [ "1870f94a9e4a16a7d00e3e58afcd5961996e48a5" ], "author": { "name": "Maciej Żenczykowski", "email": "maze@google.com", "time": "Thu Jan 25 15:51:23 2024 -0800" }, "committer": { "name": "Maciej Żenczykowski", "email": "maze@google.com", "time": "Thu Jan 25 16:09:11 2024 -0800" }, "message": "Bpf: open code PRE_T - too complex for errorprone linter\n\nTest: TreeHugger\nSigned-off-by: Maciej Żenczykowski \u003cmaze@google.com\u003e\nChange-Id: I1ad2d0dd288882e84925f0b59961dcd33612f3f7\n" }, { "commit": "7426e5756cf0b48bd7597c27ae13b4e7b9d44462", "tree": "017ef5070ae0a240c09b21182ec0e097073229d1", "parents": [ "6b9d921f1cd398ece3467d5829b43296ead6bf34" ], "author": { "name": "Maciej Żenczykowski", "email": "maze@google.com", "time": "Thu Jan 25 15:11:21 2024 -0800" }, "committer": { "name": "Maciej Żenczykowski", "email": "maze@google.com", "time": "Thu Jan 25 15:15:26 2024 -0800" }, "message": "service/lint-baseline.xml - remove BpfNetMaps\n\n(class was fixed)\n\nTest: TreeHugger\nSigned-off-by: Maciej Żenczykowski \u003cmaze@google.com\u003e\nChange-Id: Id5c67af2de5465dc12856f26e5dacec6d7138326\n" }, { "commit": "6b9d921f1cd398ece3467d5829b43296ead6bf34", "tree": "7ff06fc90cffc92f99506e8075415f9ace3eb1ca", "parents": [ "869394241ec1af423d8895d711ba38dcb8d8919e" ], "author": { "name": "Maciej Żenczykowski", "email": "maze@google.com", "time": "Thu Jan 25 15:07:05 2024 -0800" }, "committer": { "name": "Maciej Żenczykowski", "email": "maze@google.com", "time": "Thu Jan 25 15:15:26 2024 -0800" }, "message": "BpfNetMaps - add RequiresApi(T) annotations\n\nnetd.o bpf program was mainlined in T\n\nTest: TreeHugger\nSigned-off-by: Maciej Żenczykowski \u003cmaze@google.com\u003e\nChange-Id: I6d2b34e26f5640840b74d4c761b01668e44dc9d6\n" }, { "commit": "ee56c432e0307604495c7a2bddfbf5eeba4787ba", "tree": "24c51f9433deab0efb0721d26949926ed4e79211", "parents": [ "869394241ec1af423d8895d711ba38dcb8d8919e" ], "author": { "name": "Cole Faust", "email": "colefaust@google.com", "time": "Thu Jan 18 11:36:48 2024 -0800" }, "committer": { "name": "Cole Faust", "email": "colefaust@google.com", "time": "Thu Jan 25 09:38:25 2024 -0800" }, "message": "Remove strict_updatability_linting: true\n\nstrict_updatability_linting has been disabled for a while now, due to\nan expansion in scope of the NewApi check. We\u0027re going to re-enable\nit now, but doing so requires removing it from all modules that have\nbaselined NewApi issues.\n\nBug: 320698986\nTest: Presubmits\nChange-Id: Id6c9202c236f33ad89615e4d5fa5a6364147841a\nMerged-In: Id6c9202c236f33ad89615e4d5fa5a6364147841a\n" }, { "commit": "0b29cbf114e8a9c5fb2d31ec7601bb6432a49de8", "tree": "f2d2afec61e1f7f98a65d341bb3305dd9c8f0199", "parents": [ "c1f1b29ca48be9d7e6cc9c50c2cbb14eebb89911", "5c9d6cbf163325693e6ff4151472f39cbcca3a25" ], "author": { "name": "Remi NGUYEN VAN", "email": "reminv@google.com", "time": "Thu Jan 25 06:09:19 2024 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Thu Jan 25 06:09:19 2024 +0000" }, "message": "Merge \"Implement offload priority\" into main" }, { "commit": "be30b3e96eb760bc0a04fff1a4e47e82487ac2f6", "tree": "a2c8fa95240a561fb1ce04d6a0484dadcc368cfd", "parents": [ "bfb3a3c5b41a4323b117a9b3ff1305965fd5ebe0" ], "author": { "name": "Cole Faust", "email": "colefaust@google.com", "time": "Thu Jan 25 02:41:58 2024 +0000" }, "committer": { "name": "Android Build Cherrypicker Worker", "email": "android-build-cherrypicker-worker@google.com", "time": "Thu Jan 25 02:41:58 2024 +0000" }, "message": "Baseline NewApi issues\n\nNewApi is a lint check that you don\u0027t call framework methods that were\nintroduced in versions later than your min_sdk_version. We want to\nmake this an error, so we\u0027re baselineing all existing issues.\n\nThis cl was generated automatically, by taking all the NewApi issues\nfrom the reference baselines, and all the non-NewApi issues from the\nexisting checked in baselines.\n\nBug: 268261262\nTest: Presubmits\n(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:4ecdedda379e4e9040eb87b01dc3d8efb89be810)\nMerged-In: I0393f24f101876abc458ca139eefdb279dcb2b03\nChange-Id: I0393f24f101876abc458ca139eefdb279dcb2b03\n" }, { "commit": "3863c094f32db83908b78c5afc297c914dc9c7b1", "tree": "5e7063007809471710b1fe4da2b8188be62c0df2", "parents": [ "61a823471f14748c6b3b186efe6d2575fa021022" ], "author": { "name": "Maciej Żenczykowski", "email": "maze@google.com", "time": "Tue Jan 23 16:32:20 2024 -0800" }, "committer": { "name": "Maciej Żenczykowski", "email": "maze@google.com", "time": "Wed Jan 24 12:15:44 2024 -0800" }, "message": "new BpfMap\u003c\u003e - remove spurious generic type arguments\n\nTest: TreeHugger\nSigned-off-by: Maciej Żenczykowski \u003cmaze@google.com\u003e\nChange-Id: Ic32ccd7c2c415c462c4e1fdc9002cf7858ed587c\n" }, { "commit": "06155c8040d6dc77199d520f31693783dc6f90fd", "tree": "ab35398c37358d2863b19f638c6d4be2be44a1b1", "parents": [ "e64e4eaccee6c38655f79ff9fbf8abf9e241a21d" ], "author": { "name": "Maciej Żenczykowski", "email": "maze@google.com", "time": "Thu Nov 16 22:41:08 2023 -0800" }, "committer": { "name": "Maciej Żenczykowski", "email": "maze@google.com", "time": "Tue Jan 23 16:16:44 2024 -0800" }, "message": "BpfMap - add R/W constructor alias\n\nTest: TreeHugger\nSigned-off-by: Maciej Żenczykowski \u003cmaze@google.com\u003e\nChange-Id: I7cef2b19f55e6e056b46bb1b28f85c7f7376f6f4\n" }, { "commit": "5c9d6cbf163325693e6ff4151472f39cbcca3a25", "tree": "95434e67768b14a15209a08cac4e8f6374865af8", "parents": [ "0ca094b577a190c449fd4362bc1d05e579ea4629" ], "author": { "name": "Remi NGUYEN VAN", "email": "reminv@google.com", "time": "Tue Jan 23 17:14:55 2024 +0900" }, "committer": { "name": "Remi NGUYEN VAN", "email": "reminv@google.com", "time": "Tue Jan 23 19:03:55 2024 +0900" }, "message": "Implement offload priority\n\nImplement the TODO to assign priority to services based on an\noverlayable configuration.\n\nThis changes the default priority from 0 to MAX_VALUE, as higher\npriority values are less prioritized, so services not in the priority\nlist should have a high value. There is currently no user of the API\ndepending on the priority, so the change should not affect clients.\n\nTest: atest\nChange-Id: I3aae9b5fa7756de64c63974c192e4c96b632ce4e\n" } ], "next": "ca537d5e250ffaaf0e083f352630546798a07e2b" }