)]}'
{
  "log": [
    {
      "commit": "d023499777201e056bd1de3115ea2bd00c308fdd",
      "tree": "40e6f169e16d990b280ad2ac91436d00b2d7ff0a",
      "parents": [
        "c4b622b391d4bb0bb98b433fc9b95da73c965ccc"
      ],
      "author": {
        "name": "Oscar Shu",
        "email": "xshu@google.com",
        "time": "Tue May 28 23:05:58 2024 +0000"
      },
      "committer": {
        "name": "Oscar Shu",
        "email": "xshu@google.com",
        "time": "Tue Jun 04 20:42:15 2024 +0000"
      },
      "message": "Do not switch to connect choice when associated network selection is\ndisabled\n\nFix the code to respect the overlay.\n\nBug: 342987522\nBug: 344778220\nTest: atest com.android.server.wifi\nChange-Id: Iee153a3c2dd11aa9525ad72ba3acc1d50e696f4c\n"
    },
    {
      "commit": "c4b622b391d4bb0bb98b433fc9b95da73c965ccc",
      "tree": "a9587bca8d4d956103bd56deaa1f390229f504b1",
      "parents": [
        "cade7c8a427266711fa55e0d74b5e3f88a2bb06e",
        "db2b71ba4a707221e8d29e5de07e8cdfaf25b04b"
      ],
      "author": {
        "name": "Nate Jiang",
        "email": "qiangjiang@google.com",
        "time": "Wed May 29 22:04:56 2024 +0000"
      },
      "committer": {
        "name": "Automerger Merge Worker",
        "email": "android-build-automerger-merge-worker@system.gserviceaccount.com",
        "time": "Wed May 29 22:04:56 2024 +0000"
      },
      "message": "[automerger skipped] Should only call the new callback am: db2b71ba4a -s ours\n\nam skip reason: Merged-In I4e1c0d8dce4fd6d1be51653f776843a66cb7ec85 with SHA-1 0ecd3aea17 is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Wifi/+/27536028\n\nChange-Id: I2d36c127d1482f2da6d654ea7cd09a3cbd7790b8\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n"
    },
    {
      "commit": "cade7c8a427266711fa55e0d74b5e3f88a2bb06e",
      "tree": "a9587bca8d4d956103bd56deaa1f390229f504b1",
      "parents": [
        "89e0d2528a0d19a2be94b62bf7afa7035cecb3cc",
        "9e1e0e1b4dadde13bfb576a4139ca5ecc32be0e5"
      ],
      "author": {
        "name": "Quang Anh Luong",
        "email": "qal@google.com",
        "time": "Wed May 29 22:04:50 2024 +0000"
      },
      "committer": {
        "name": "Automerger Merge Worker",
        "email": "android-build-automerger-merge-worker@system.gserviceaccount.com",
        "time": "Wed May 29 22:04:50 2024 +0000"
      },
      "message": "[automerger skipped] Update SoftApState for API council feedback am: 9e1e0e1b4d -s ours\n\nam skip reason: Merged-In Ib12360af81ef2df6125e58daf28ad014517cea8b with SHA-1 ad2b55a946 is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Wifi/+/27536030\n\nChange-Id: I10fc03d717d634fa3d0fc3346023d52609e6f41a\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n"
    },
    {
      "commit": "89e0d2528a0d19a2be94b62bf7afa7035cecb3cc",
      "tree": "a9587bca8d4d956103bd56deaa1f390229f504b1",
      "parents": [
        "bae12330face607ba5ac4c47e9f144eba7b46a9a",
        "d4b1bc1cf4b8f7541f1e759fcba8a05347a3c4ef"
      ],
      "author": {
        "name": "Cole Faust",
        "email": "colefaust@google.com",
        "time": "Wed May 29 21:58:07 2024 +0000"
      },
      "committer": {
        "name": "Automerger Merge Worker",
        "email": "android-build-automerger-merge-worker@system.gserviceaccount.com",
        "time": "Wed May 29 21:58:07 2024 +0000"
      },
      "message": "Fix BoxedPrimitiveEquality errorprone issue am: d4b1bc1cf4\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Wifi/+/27519067\n\nChange-Id: If160535a8bf5e2b9d9ace27bb6ab9152fc4fffdc\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n"
    },
    {
      "commit": "bae12330face607ba5ac4c47e9f144eba7b46a9a",
      "tree": "a9587bca8d4d956103bd56deaa1f390229f504b1",
      "parents": [
        "2164d86e417e5546b37aebab50d24d35f08433b4",
        "1a09c3d431b9af008b7585b0fce58be48da9bd37"
      ],
      "author": {
        "name": "Xin Li",
        "email": "delphij@google.com",
        "time": "Wed May 29 21:30:13 2024 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Wed May 29 21:30:13 2024 +0000"
      },
      "message": "Merge \"[automerger skipped] Merge Android 24Q2 Release (ab/11526283) to aosp-main-future am: 19dbd73170 -s ours\" into main"
    },
    {
      "commit": "2164d86e417e5546b37aebab50d24d35f08433b4",
      "tree": "a9587bca8d4d956103bd56deaa1f390229f504b1",
      "parents": [
        "eb29b8791e6b8dd3648aec4ad07ff5014054c503",
        "0b982af97721be4665bd54b0cf174f82f386c7de"
      ],
      "author": {
        "name": "Nate Jiang",
        "email": "qiangjiang@google.com",
        "time": "Wed May 29 21:15:58 2024 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Wed May 29 21:15:58 2024 +0000"
      },
      "message": "Merge \"Write data to store immediately when HAL service died\" into main"
    },
    {
      "commit": "eb29b8791e6b8dd3648aec4ad07ff5014054c503",
      "tree": "222be6ff88a282d0fa550bf092f85eec2dc0a5c1",
      "parents": [
        "0ae756356a31f2072052cc920fb6624b86006920",
        "bfeb923731d4e3537198b201b6d0573c3a6bc9fa"
      ],
      "author": {
        "name": "Treehugger Robot",
        "email": "android-test-infra-autosubmit@system.gserviceaccount.com",
        "time": "Wed May 29 21:00:11 2024 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Wed May 29 21:00:11 2024 +0000"
      },
      "message": "Merge \"Allow disabling specific auto-bugreport triggers\" into main"
    },
    {
      "commit": "1a09c3d431b9af008b7585b0fce58be48da9bd37",
      "tree": "be607a52acc16c079b159bee2412c85ae755f443",
      "parents": [
        "0ae756356a31f2072052cc920fb6624b86006920",
        "19dbd73170ffaf5d01ac8847c0d3875e2118f826"
      ],
      "author": {
        "name": "Xin Li",
        "email": "delphij@google.com",
        "time": "Wed May 29 20:48:48 2024 +0000"
      },
      "committer": {
        "name": "Automerger Merge Worker",
        "email": "android-build-automerger-merge-worker@system.gserviceaccount.com",
        "time": "Wed May 29 20:48:48 2024 +0000"
      },
      "message": "[automerger skipped] Merge Android 24Q2 Release (ab/11526283) to aosp-main-future am: 19dbd73170 -s ours\n\nam skip reason: Merged-In I97040ef70395010900b52a37a5ea077c11744421 with SHA-1 b2616c74ce is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Wifi/+/27274025\n\nChange-Id: I21d7d87b6add3979baa77bd6bf54722120edc19b\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n"
    },
    {
      "commit": "0b982af97721be4665bd54b0cf174f82f386c7de",
      "tree": "33341d25b81878204bb853b8cb3faa30d85543b1",
      "parents": [
        "0ae756356a31f2072052cc920fb6624b86006920"
      ],
      "author": {
        "name": "Nate Jiang",
        "email": "qiangjiang@google.com",
        "time": "Wed May 29 10:51:18 2024 -0700"
      },
      "committer": {
        "name": "Nate Jiang",
        "email": "qiangjiang@google.com",
        "time": "Wed May 29 12:51:36 2024 -0700"
      },
      "message": "Write data to store immediately when HAL service died\n\nAs some cases like `adb reboot` would not trigger ACTION_SHUTDOWN\nbroadcast. Monitor the Wifi HAL service state to trigger a write to\nstore to handle this kind of cases\n\nBug: 341884855\nTest: atest com.android.server.wifi\nChange-Id: Ied066ebe4d80915a111adf506dcb0bc59b183835\n"
    },
    {
      "commit": "0ae756356a31f2072052cc920fb6624b86006920",
      "tree": "be607a52acc16c079b159bee2412c85ae755f443",
      "parents": [
        "93a4d0afeb488cd44ff31699d5e8d3141cde92d1",
        "bed1b455f7f6aa08c64d7b245239c0d6461ba81f"
      ],
      "author": {
        "name": "Sunil Ravi",
        "email": "sunilravi@google.com",
        "time": "Wed May 29 13:21:07 2024 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Wed May 29 13:21:07 2024 +0000"
      },
      "message": "Merge \"P2P: Generate IPV6 address based on EUI64\" into main"
    },
    {
      "commit": "bed1b455f7f6aa08c64d7b245239c0d6461ba81f",
      "tree": "0293383936916a62b3bb458b77836fcfd52dc314",
      "parents": [
        "309a9a8da1c2235dafa1b22edabc6c2b5a93041d"
      ],
      "author": {
        "name": "Sunil Ravi",
        "email": "sunilravi@google.com",
        "time": "Wed May 22 15:35:11 2024 +0000"
      },
      "committer": {
        "name": "Sunil Ravi",
        "email": "sunilravi@google.com",
        "time": "Wed May 29 02:31:55 2024 +0000"
      },
      "message": "P2P: Generate IPV6 address based on EUI64\n\nSpecify in p2p client provisioning configuration to generate\nIPv6 link local only address from the interface\u0027s\nMAC address using the modified EUI-64 format. This\nchange is done due to the following reasons,\n1. Kernel default configuration to generate the\nIPV6 address (addr_gen_mode) is based on EUI64.\nOn the P2P GO side, network stack/wifi framework has no\nway to overwrite this configuration. So the IPV6 address of GO\nis derived based on the P2P GO interface MAC address. Whereas\non the client side the network stack overwrite the configuration\nto generate the IPV6 address based on the secret from stable_secret\nconfiguration. So the IPV6 address is generared based on different modes\non P2P client and GO. So on devices which uses the same static interface\nfor P2P device interface and group interface will be using the last\nupdated configuration from network stack for deriving the IPV6 address.\nSo when a device changes the role from P2P Client to P2P GO, the IPV6\naddress will be derived based on the secret. So in order to have the\nsame IPV6 address generation mode reliably, wifi p2p framework needs to set the mode\non P2P client side.\n2. The IPV6 provisioning mode - GROUP_CLIENT_IP_PROVISIONING_MODE_IPV6_LINK_LOCAL\non the P2P client side is designed based on the reasoning that the P2P\nGO always generate the IPV6 address based on EUI64.\n\nBug: 334762957\nTest: Manual - Establish P2P connection and verified using\nifconfig \u003cinterface name\u003e on both P2P GO and P2P CLIENT side\nthat IPV6 address is based on EUI-64 format\n\nChange-Id: I4e5f6467c5e588505f98d9f4e0c42417daac1f90\n"
    },
    {
      "commit": "93a4d0afeb488cd44ff31699d5e8d3141cde92d1",
      "tree": "970f48f03f945d68143797a52141aeced5cb4414",
      "parents": [
        "0b5adf2031afa6599ea77dac15518b43c942ecfe",
        "616e71a8e6dbc5f9fd438f38110758f67eff3601"
      ],
      "author": {
        "name": "Sunil Ravi",
        "email": "sunilravi@google.com",
        "time": "Wed May 29 02:29:57 2024 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Wed May 29 02:29:57 2024 +0000"
      },
      "message": "Merge \"DppManager:fix NPE problem to aviod WiFi crash.\" into main"
    },
    {
      "commit": "0b5adf2031afa6599ea77dac15518b43c942ecfe",
      "tree": "22431337dcca8e259f60f4e72cbe26c793e4bf9c",
      "parents": [
        "8b90961df430e9b743796331cbb1b58cc1e13734",
        "4437165d3c593ebd6714cff5300964dd2fd134e8"
      ],
      "author": {
        "name": "Nate Jiang",
        "email": "qiangjiang@google.com",
        "time": "Tue May 28 23:50:24 2024 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Tue May 28 23:50:24 2024 +0000"
      },
      "message": "Merge \"Fix the Aware state machine logging\" into main"
    },
    {
      "commit": "616e71a8e6dbc5f9fd438f38110758f67eff3601",
      "tree": "f2dedf8ea35ae3c6836baa4bb466f92c9bfb3fcc",
      "parents": [
        "309a9a8da1c2235dafa1b22edabc6c2b5a93041d"
      ],
      "author": {
        "name": "lijilou",
        "email": "lijilou@xiaomi.corp-partner.google.com",
        "time": "Mon May 27 17:54:21 2024 +0800"
      },
      "committer": {
        "name": "Sunil Ravi",
        "email": "sunilravi@google.com",
        "time": "Tue May 28 23:49:56 2024 +0000"
      },
      "message": "DppManager:fix NPE problem to aviod WiFi crash.\n\nIn many scenarios, such as the stopDppSession scenario,\nthe cleanupDppResources method is called to clean up\nresources and the variable mDppRequestInfo is set to null.\nWhen binderDied occurs, a null pointer exception will occur.\n\nTest: OEM monkey test\nBug: 342979271\nChange-Id: I24c722d8e7bcbb438da89b0b18b371dac267901b\n"
    },
    {
      "commit": "8b90961df430e9b743796331cbb1b58cc1e13734",
      "tree": "e25eeb401547420a0e510d1f5f89e556e92eda7f",
      "parents": [
        "9f2f3f98df0c7a39fd6404e9635ffb6ec69d54cc",
        "38a98e15866682832c85177243c646a6d0c113b9"
      ],
      "author": {
        "name": "Nate Jiang",
        "email": "qiangjiang@google.com",
        "time": "Tue May 28 20:29:24 2024 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Tue May 28 20:29:24 2024 +0000"
      },
      "message": "Merge \"Add old methods back to prevent crash on old devices\" into main"
    },
    {
      "commit": "9f2f3f98df0c7a39fd6404e9635ffb6ec69d54cc",
      "tree": "efe0889833a903b0d1731eb4f3806d4fac2e38d8",
      "parents": [
        "78574bf0b879a71876a24a7d5c340263ee46265f",
        "ce274f034331be9b24c2e125085980e264df1f86"
      ],
      "author": {
        "name": "Treehugger Robot",
        "email": "android-test-infra-autosubmit@system.gserviceaccount.com",
        "time": "Tue May 28 20:05:22 2024 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Tue May 28 20:05:22 2024 +0000"
      },
      "message": "Merge \"Move log to the server side\" into main"
    },
    {
      "commit": "38a98e15866682832c85177243c646a6d0c113b9",
      "tree": "c6b1fa1b0e14f79bb3fb18b9051e33374389aaff",
      "parents": [
        "78574bf0b879a71876a24a7d5c340263ee46265f"
      ],
      "author": {
        "name": "Nate Jiang",
        "email": "qiangjiang@google.com",
        "time": "Tue May 28 10:30:48 2024 -0700"
      },
      "committer": {
        "name": "Nate Jiang",
        "email": "qiangjiang@google.com",
        "time": "Tue May 28 19:12:17 2024 +0000"
      },
      "message": "Add old methods back to prevent crash on old devices\n\nSome OEMs old devices are using the methods with old signature. Adding\nthose back until we are sure no more usage.\n\nBug: 342976570\nTest: atest com.android.server.wifi\nChange-Id: I7e691755ea9d7bd2185dc075fedc89e252f13169\n"
    },
    {
      "commit": "db2b71ba4a707221e8d29e5de07e8cdfaf25b04b",
      "tree": "381afaecd3d806882508836638f4ee0cb1f9d970",
      "parents": [
        "9e1e0e1b4dadde13bfb576a4139ca5ecc32be0e5"
      ],
      "author": {
        "name": "Nate Jiang",
        "email": "qiangjiang@google.com",
        "time": "Thu Mar 28 14:37:32 2024 -0700"
      },
      "committer": {
        "name": "Cherrypicker Worker",
        "email": "android-build-cherrypicker-worker@google.com",
        "time": "Sun May 26 08:05:17 2024 +0000"
      },
      "message": "Should only call the new callback\n\nAlso check null on the service side\n\nBug: 325544756\nTest: atest WifiManagerTest\n(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:0ecd3aea171d62e82a234698114d5ad8df1074ac)\nMerged-In: I4e1c0d8dce4fd6d1be51653f776843a66cb7ec85\nChange-Id: I4e1c0d8dce4fd6d1be51653f776843a66cb7ec85\n"
    },
    {
      "commit": "9e1e0e1b4dadde13bfb576a4139ca5ecc32be0e5",
      "tree": "e84164e169470559cc2d692b81867d77bd9a4156",
      "parents": [
        "d4b1bc1cf4b8f7541f1e759fcba8a05347a3c4ef"
      ],
      "author": {
        "name": "Quang Anh Luong",
        "email": "qal@google.com",
        "time": "Thu Mar 21 18:47:27 2024 +0900"
      },
      "committer": {
        "name": "Cherrypicker Worker",
        "email": "android-build-cherrypicker-worker@google.com",
        "time": "Sun May 26 08:05:07 2024 +0000"
      },
      "message": "Update SoftApState for API council feedback\n\nUpdate SoftApState with\n1) Throw IllegalStateException if getFailureReason() is called when not\n   in failure state.\n2) Clarify the compatibility story between the new onStateChanged and\n   the old.\n\nBug: 329899277\nTest: atest SoftApStateTest\n(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:ad2b55a9469eb450c1184769d9553a51a55f6f93)\nMerged-In: Ib12360af81ef2df6125e58daf28ad014517cea8b\nChange-Id: Ib12360af81ef2df6125e58daf28ad014517cea8b\n"
    },
    {
      "commit": "d4b1bc1cf4b8f7541f1e759fcba8a05347a3c4ef",
      "tree": "ffc93dc61267734dec71893dc7b83a41f93df39f",
      "parents": [
        "19dbd73170ffaf5d01ac8847c0d3875e2118f826"
      ],
      "author": {
        "name": "Cole Faust",
        "email": "colefaust@google.com",
        "time": "Tue Mar 19 12:30:01 2024 -0700"
      },
      "committer": {
        "name": "Xin Li",
        "email": "delphij@google.com",
        "time": "Fri May 24 16:41:38 2024 -0700"
      },
      "message": "Fix BoxedPrimitiveEquality errorprone issue\n\nBug: 253827323\nTest: m RUN_ERROR_PRONE\u003dtrue javac-check\nChange-Id: Ia1d09a0bfa1511dc2ebed80eb42f5e8ecabeb8a3\n"
    },
    {
      "commit": "78574bf0b879a71876a24a7d5c340263ee46265f",
      "tree": "fd8febc2096be493144e61fba3ba810b56edb1b3",
      "parents": [
        "34d87e375fb669e8d008372bbf33875ddf2fe880",
        "8571f6a857d2abe37bee31649f66c9ea5c73ada9"
      ],
      "author": {
        "name": "Stephanie Bak",
        "email": "dasol@google.com",
        "time": "Fri May 24 21:42:04 2024 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Fri May 24 21:42:04 2024 +0000"
      },
      "message": "Merge \"Enable roaming mode for primary on disconnect\" into main"
    },
    {
      "commit": "34d87e375fb669e8d008372bbf33875ddf2fe880",
      "tree": "7cf03db342ad01394438f1e5e562f6b627659d54",
      "parents": [
        "c72adbc9a114e11f9d07e9c1c80160fced843abd",
        "1d00d87e446a2ee023df9d6207e4797d1819865d"
      ],
      "author": {
        "name": "Stephanie Bak",
        "email": "dasol@google.com",
        "time": "Fri May 24 21:41:48 2024 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Fri May 24 21:41:48 2024 +0000"
      },
      "message": "Merge \"Add log for checkNearbyDevicesPermission in WifiPermissionsUtil\" into main"
    },
    {
      "commit": "c72adbc9a114e11f9d07e9c1c80160fced843abd",
      "tree": "d61725b89f4deb2ae21162621d7cb5df7325c91e",
      "parents": [
        "1a2ffd5ee0fc93c4e808c1d19e8fe2b15d984e8b",
        "f4a61c6e9fa24f5058c0b7f87fa68525f8f57f68"
      ],
      "author": {
        "name": "Sunil Ravi",
        "email": "sunilravi@google.com",
        "time": "Fri May 24 20:24:27 2024 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Fri May 24 20:24:27 2024 +0000"
      },
      "message": "Merge \"Set PMF required when connecting to WPA3 network\" into main"
    },
    {
      "commit": "1a2ffd5ee0fc93c4e808c1d19e8fe2b15d984e8b",
      "tree": "f49a6b6162e82826efa8420d3efb43ab8c00f169",
      "parents": [
        "25f69354c8226c392a1dc41e4cffdd8d1a36d6bf"
      ],
      "author": {
        "name": "maheshkkv",
        "email": "maheshkkv@google.com",
        "time": "Fri May 17 10:26:54 2024 -0700"
      },
      "committer": {
        "name": "Mahesh KKV",
        "email": "maheshkkv@google.com",
        "time": "Fri May 24 17:00:17 2024 +0000"
      },
      "message": "Add channel width to WifiAvailableChannel\n\nBug: 335358378\nTest: atest FrameworksWifiApiTests\naconfig flags: Flag: com.android.wifi.flags.FLAG_GET_CHANNEL_WIDTH_API\n\nChange-Id: Ifd0bd0acd5d234b4f448ea5fc58fc9adfea7244a\n"
    },
    {
      "commit": "19dbd73170ffaf5d01ac8847c0d3875e2118f826",
      "tree": "ab601a1ffd17077f2fe5154d4bc06c8cdff2392b",
      "parents": [
        "50b274940f707dac559e6f3503ff8f6f57402405",
        "b2616c74ce71125311561cb5bd3653e55def0797"
      ],
      "author": {
        "name": "Xin Li",
        "email": "delphij@google.com",
        "time": "Mon May 06 13:21:50 2024 -0700"
      },
      "committer": {
        "name": "Xin Li",
        "email": "delphij@google.com",
        "time": "Fri May 24 09:59:51 2024 -0700"
      },
      "message": "Merge Android 24Q2 Release (ab/11526283) to aosp-main-future\n\nBug: 337098550\nMerged-In: I97040ef70395010900b52a37a5ea077c11744421\nChange-Id: Id86646603deb5529f6524bd5062085dcb50489bd\n"
    },
    {
      "commit": "bfeb923731d4e3537198b201b6d0573c3a6bc9fa",
      "tree": "0e476093bd756047f8126495dfe8b0c585da6612",
      "parents": [
        "dd24d362ef94c951209343c969a7e2051eff91de"
      ],
      "author": {
        "name": "Oscar Shu",
        "email": "xshu@google.com",
        "time": "Wed May 22 23:15:52 2024 +0000"
      },
      "committer": {
        "name": "Oscar Shu",
        "email": "xshu@google.com",
        "time": "Thu May 23 18:07:20 2024 +0000"
      },
      "message": "Allow disabling specific auto-bugreport triggers\n\nAdd a hook to stop triggering bugreport based on server side\nconfiguration.\n\nBug: 336376991\nTest: atest com.android.server.wifi\nChange-Id: I143281c12cc1cb417297ce77f677ee2bb679e80f\n"
    },
    {
      "commit": "4437165d3c593ebd6714cff5300964dd2fd134e8",
      "tree": "c5f8fd377093b211aabb4686b85b0f5d6c462606",
      "parents": [
        "af3ffabe22d803d34167b84e77f81833cf1176ac"
      ],
      "author": {
        "name": "qiangjiang",
        "email": "qiangjiang@google.com",
        "time": "Thu May 23 16:44:23 2024 +0000"
      },
      "committer": {
        "name": "qiangjiang",
        "email": "qiangjiang@google.com",
        "time": "Thu May 23 16:46:17 2024 +0000"
      },
      "message": "Fix the Aware state machine logging\n\nAlso fix the thread run time logging\n\nBug: 295398783\nTest: atest com.android.server.wifi\nChange-Id: I0897b59787057fd732ecefc46664db3f301566a4\n"
    },
    {
      "commit": "8571f6a857d2abe37bee31649f66c9ea5c73ada9",
      "tree": "a53ce0dda3f8600d6619bcafe6adef15119de45e",
      "parents": [
        "a34128b6c1f751858917651012f5dc71ebdeede3"
      ],
      "author": {
        "name": "Stephanie Bak",
        "email": "dasol@google.com",
        "time": "Wed May 22 10:47:34 2024 +0000"
      },
      "committer": {
        "name": "Stephanie Bak",
        "email": "dasol@google.com",
        "time": "Thu May 23 00:38:48 2024 +0000"
      },
      "message": "Enable roaming mode for primary on disconnect\n\nBug: 309873247\nTest: atest com.android.server.wifi\nChange-Id: If1aafb0dcb666d551ce3b87fd5884cb92498e467\n"
    },
    {
      "commit": "1d00d87e446a2ee023df9d6207e4797d1819865d",
      "tree": "b308e8f37b442c84dd5d6212ed4b2ae3c1d91454",
      "parents": [
        "25f69354c8226c392a1dc41e4cffdd8d1a36d6bf"
      ],
      "author": {
        "name": "Stephanie Bak",
        "email": "dasol@google.com",
        "time": "Thu May 23 00:35:52 2024 +0000"
      },
      "committer": {
        "name": "Stephanie Bak",
        "email": "dasol@google.com",
        "time": "Thu May 23 00:35:54 2024 +0000"
      },
      "message": "Add log for checkNearbyDevicesPermission in WifiPermissionsUtil\n\nBug: 341975850\nChange-Id: I5a4096d3c8b7b7e7a34e66e1c98aac8fc923c76f\nTest: presubmit\n"
    },
    {
      "commit": "ce274f034331be9b24c2e125085980e264df1f86",
      "tree": "3fcb397dd1df4c3707f29d0957941e1d0bd9ec40",
      "parents": [
        "af3ffabe22d803d34167b84e77f81833cf1176ac"
      ],
      "author": {
        "name": "Nate Jiang",
        "email": "qiangjiang@google.com",
        "time": "Wed May 22 15:56:35 2024 -0700"
      },
      "committer": {
        "name": "Nate Jiang",
        "email": "qiangjiang@google.com",
        "time": "Wed May 22 15:56:35 2024 -0700"
      },
      "message": "Move log to the server side\n\nBug: 341658109\nTest: atest com.android.server.wifi\nChange-Id: I1cd6c35648270ebe6de0a70224def862dc7c698a\n"
    },
    {
      "commit": "25f69354c8226c392a1dc41e4cffdd8d1a36d6bf",
      "tree": "f7c4aee80c7eb822700d03f58279b5a173097aef",
      "parents": [
        "98fde9f411bb950b882ac664235dd0cb68cf2009",
        "fe8a9e6a1adf7ebce84a93cb0af054c6d49cb42c"
      ],
      "author": {
        "name": "Bill Yi",
        "email": "byi@google.com",
        "time": "Wed May 22 18:46:34 2024 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Wed May 22 18:46:34 2024 +0000"
      },
      "message": "Merge \"Import translations. DO NOT MERGE ANYWHERE\" into main"
    },
    {
      "commit": "98fde9f411bb950b882ac664235dd0cb68cf2009",
      "tree": "80c3b538802826b587bf263874e147800da37ecd",
      "parents": [
        "9b28c526b5d195d11db3ff8fb4a1ba19d4691e50",
        "79a525d9a7fd9ecc096ed7977306070820499c46"
      ],
      "author": {
        "name": "Bill Yi",
        "email": "byi@google.com",
        "time": "Wed May 22 18:30:58 2024 +0000"
      },
      "committer": {
        "name": "Automerger Merge Worker",
        "email": "android-build-automerger-merge-worker@system.gserviceaccount.com",
        "time": "Wed May 22 18:30:58 2024 +0000"
      },
      "message": "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 79a525d9a7 -s ours\n\nam skip reason: contains skip directive\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Wifi/+/27440690\n\nChange-Id: I46cdcc175ca22c9c5f7789efda0b391ea29dd1c8\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n"
    },
    {
      "commit": "9b28c526b5d195d11db3ff8fb4a1ba19d4691e50",
      "tree": "80c3b538802826b587bf263874e147800da37ecd",
      "parents": [
        "af3ffabe22d803d34167b84e77f81833cf1176ac",
        "3501d0bde9ad93a04e7ebe078ce50abfb3f9d5f7"
      ],
      "author": {
        "name": "Priyanka Advani",
        "email": "padvani@google.com",
        "time": "Wed May 22 18:07:49 2024 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Wed May 22 18:07:49 2024 +0000"
      },
      "message": "Merge \"Revert \"Wifi: Fix TX/RX linkspeeds not updating properly on network details page\"\" into main"
    },
    {
      "commit": "3501d0bde9ad93a04e7ebe078ce50abfb3f9d5f7",
      "tree": "2224b916a5dbfbd844b9fbca42369b6911ed60e7",
      "parents": [
        "2b5864f80d07cb41870db9b3a876e36827bcb290"
      ],
      "author": {
        "name": "Chaitanya Cheemala",
        "email": "ccheemala@google.com",
        "time": "Wed May 22 10:59:52 2024 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Wed May 22 10:59:52 2024 +0000"
      },
      "message": "Revert \"Wifi: Fix TX/RX linkspeeds not updating properly on network details page\"\n\nThis reverts commit 2b5864f80d07cb41870db9b3a876e36827bcb290.\n\nReason for revert: Likely culprit for b/342012580  - verifying through ABTD before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted.\n\nChange-Id: Ia1945241dbd7e2ea2e15eec551495d815b4cdc08\n"
    },
    {
      "commit": "f4a61c6e9fa24f5058c0b7f87fa68525f8f57f68",
      "tree": "168b2f7dd2c9c44607cc0cd7653e216526f34498",
      "parents": [
        "cd50abacf904b51103e8537cb817e82cbfa498a4"
      ],
      "author": {
        "name": "Sunil Ravi",
        "email": "sunilravi@google.com",
        "time": "Wed May 22 00:35:55 2024 +0000"
      },
      "committer": {
        "name": "Sunil Ravi",
        "email": "sunilravi@google.com",
        "time": "Wed May 22 00:35:55 2024 +0000"
      },
      "message": "Set PMF required when connecting to WPA3 network\n\nWhen user explicitly configure a network to WPA3 Personal or\nWPA3 Enterprise (Via Add network option in settings), the PMF required\nbit should be set in the association request RSN capabilities. So don\u0027t\nturn off the PMF required bit in security params when the AP is\nconfigured in transition network and when the local secuirty params in\nnot added by auto upgrade.\n\nBug: 338519250\nTest: Manual - Configured a WPA3-TM network in settings -\u003e Add network -\u003e\nwith security type WPA3 and confirmed from the sniffer logs that PMF\nrequired bit is set in Association request RSN capabilities.\n\nChange-Id: Iba047b5b1161a7df1cb15752967de5da3a01c622\n"
    },
    {
      "commit": "af3ffabe22d803d34167b84e77f81833cf1176ac",
      "tree": "a94886822e347fee14a10191c8fbb1853ae415ea",
      "parents": [
        "a2ea8ae1c9e47071962bd4b0c19a11507a6626a8",
        "fb16ab27161e2839cf03373778a967571d32a3b9"
      ],
      "author": {
        "name": "Yi Shiou (Les) Lee",
        "email": "lesl@google.com",
        "time": "Wed May 22 00:30:45 2024 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Wed May 22 00:30:45 2024 +0000"
      },
      "message": "Merge \"wifi: Move isWifiCall check to WifiCarrierInfoManager\" into main"
    },
    {
      "commit": "a2ea8ae1c9e47071962bd4b0c19a11507a6626a8",
      "tree": "7fb0e4fad63bf8a60bef67041fe8dc477f1f6d3a",
      "parents": [
        "40e137884e1f7b84514d44627984899ffe1b3ebe",
        "673c47c7cd001989c225066870b51a985c6d8f52"
      ],
      "author": {
        "name": "Bill Yi",
        "email": "byi@google.com",
        "time": "Tue May 21 23:02:38 2024 +0000"
      },
      "committer": {
        "name": "Automerger Merge Worker",
        "email": "android-build-automerger-merge-worker@system.gserviceaccount.com",
        "time": "Tue May 21 23:02:38 2024 +0000"
      },
      "message": "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 673c47c7cd -s ours\n\nam skip reason: contains skip directive\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Wifi/+/27441905\n\nChange-Id: Ie00eddd1284dd07e0ef66e728f6e8f07fd01d29a\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n"
    },
    {
      "commit": "40e137884e1f7b84514d44627984899ffe1b3ebe",
      "tree": "7fb0e4fad63bf8a60bef67041fe8dc477f1f6d3a",
      "parents": [
        "23eadd8d26de51de350b22bacf3b0d7216dadb78",
        "c8c40c71d6827b0edebac7fc93239987e5b69018"
      ],
      "author": {
        "name": "Nate Jiang",
        "email": "qiangjiang@google.com",
        "time": "Tue May 21 22:04:18 2024 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Tue May 21 22:04:18 2024 +0000"
      },
      "message": "Merge \"Add log for handle device shutdown\" into main"
    },
    {
      "commit": "673c47c7cd001989c225066870b51a985c6d8f52",
      "tree": "b65a0646b96adebc84fffa3bb8f2e449b2329a9a",
      "parents": [
        "5801dc5a029e32e28259732b1b12688dfe3a293f"
      ],
      "author": {
        "name": "Bill Yi",
        "email": "byi@google.com",
        "time": "Tue May 21 11:25:53 2024 -0700"
      },
      "committer": {
        "name": "Bill Yi",
        "email": "byi@google.com",
        "time": "Tue May 21 11:25:53 2024 -0700"
      },
      "message": "Import translations. DO NOT MERGE ANYWHERE\n\nAuto-generated-cl: translation import\nChange-Id: I23782cfac2fc5a57c62a28ac7261412a89a893e7\n"
    },
    {
      "commit": "fe8a9e6a1adf7ebce84a93cb0af054c6d49cb42c",
      "tree": "7a6b8349775360e82111d3c405ed9f6ae9addf99",
      "parents": [
        "7a4f1bfff987af42a5020bfdc45a2e7797f787ac"
      ],
      "author": {
        "name": "Bill Yi",
        "email": "byi@google.com",
        "time": "Tue May 21 11:25:11 2024 -0700"
      },
      "committer": {
        "name": "Bill Yi",
        "email": "byi@google.com",
        "time": "Tue May 21 11:25:11 2024 -0700"
      },
      "message": "Import translations. DO NOT MERGE ANYWHERE\n\nAuto-generated-cl: translation import\nChange-Id: Ia736cd496f941aa1e89c9026613e057ceba710e0\n"
    },
    {
      "commit": "79a525d9a7fd9ecc096ed7977306070820499c46",
      "tree": "0d8b9e986b752c32649feab104d883fccc4851a2",
      "parents": [
        "a2f3f41c1af2ed719b465b09cc842f8c2ca673fe"
      ],
      "author": {
        "name": "Bill Yi",
        "email": "byi@google.com",
        "time": "Tue May 21 11:23:24 2024 -0700"
      },
      "committer": {
        "name": "Bill Yi",
        "email": "byi@google.com",
        "time": "Tue May 21 11:23:24 2024 -0700"
      },
      "message": "Import translations. DO NOT MERGE ANYWHERE\n\nAuto-generated-cl: translation import\nChange-Id: I2dfe464041b1503f018e7da23d4f754fc25a6036\n"
    },
    {
      "commit": "23eadd8d26de51de350b22bacf3b0d7216dadb78",
      "tree": "f70f0ebed54885e73719288c15d37bd7bed7ba63",
      "parents": [
        "7a4f1bfff987af42a5020bfdc45a2e7797f787ac",
        "2b5864f80d07cb41870db9b3a876e36827bcb290"
      ],
      "author": {
        "name": "Treehugger Robot",
        "email": "android-test-infra-autosubmit@system.gserviceaccount.com",
        "time": "Tue May 21 17:27:51 2024 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Tue May 21 17:27:51 2024 +0000"
      },
      "message": "Merge \"Wifi: Fix TX/RX linkspeeds not updating properly on network details page\" into main"
    },
    {
      "commit": "7a4f1bfff987af42a5020bfdc45a2e7797f787ac",
      "tree": "a030de57f82428d5d8266f60d69cdcaf52019f19",
      "parents": [
        "dd24d362ef94c951209343c969a7e2051eff91de",
        "cd50abacf904b51103e8537cb817e82cbfa498a4"
      ],
      "author": {
        "name": "Sunil Ravi",
        "email": "sunilravi@google.com",
        "time": "Tue May 21 03:55:44 2024 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Tue May 21 03:55:44 2024 +0000"
      },
      "message": "Merge \"Turn OFF 802.11BE config if device doesn\u0027t support\" into main"
    },
    {
      "commit": "cd50abacf904b51103e8537cb817e82cbfa498a4",
      "tree": "c88d28f6498cea33f314cf43f9013b5d0dcd9aca",
      "parents": [
        "309a9a8da1c2235dafa1b22edabc6c2b5a93041d"
      ],
      "author": {
        "name": "Sunil Ravi",
        "email": "sunilravi@google.com",
        "time": "Thu May 16 22:24:53 2024 +0000"
      },
      "committer": {
        "name": "Sunil Ravi",
        "email": "sunilravi@google.com",
        "time": "Mon May 20 17:32:35 2024 +0000"
      },
      "message": "Turn OFF 802.11BE config if device doesn\u0027t support\n\nIf the OEM configuration for the device support\nfor softAp 802.11BE support (config_wifiSoftapIeee80211beSupported)\nis set to false, turn OFF the 802.11BE configuration from\nSoftAp configuration.\n\nBug: 339317024\nTest: atest com.android.server.wifi.util.ApConfigUtilTest\nTest: atest com.android.server.wifi.SoftApManagerTest\nTest: Manual - SoftAp ON/OFF\n\nChange-Id: Ibdfd1f9d26e5d6d8be6a728f3ef27cde90d7f128\n"
    },
    {
      "commit": "dd24d362ef94c951209343c969a7e2051eff91de",
      "tree": "1badb59ab9a92727a7d8315b57e78cd8645cea6d",
      "parents": [
        "f65f35ccf4168c71827a3560b980ea43e77b7f9c",
        "86e22d166e2313ea9131423c9e8270e8eb41351c"
      ],
      "author": {
        "name": "Quang Luong",
        "email": "qal@google.com",
        "time": "Mon May 20 06:41:45 2024 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Mon May 20 06:41:45 2024 +0000"
      },
      "message": "Merge \"Fix startTetheredHotspot failure during SAP teardown\" into main"
    },
    {
      "commit": "f65f35ccf4168c71827a3560b980ea43e77b7f9c",
      "tree": "0bb1e09dbe9ef227ce0963f8c0504e566040f6e9",
      "parents": [
        "128faae1c7d9454607f9923f5eb9c28497a599d4"
      ],
      "author": {
        "name": "Nate Jiang",
        "email": "qiangjiang@google.com",
        "time": "Fri May 17 10:58:19 2024 -0700"
      },
      "committer": {
        "name": "Nate Jiang",
        "email": "qiangjiang@google.com",
        "time": "Fri May 17 20:00:24 2024 +0000"
      },
      "message": "Add SuppressLint to avoid lint error\n\nWifiP2pManager is using the async channel, APIs follows the same pattern\n\nBug: 340879583\nTest: m checkapi\nChange-Id: Ia6d4061f18c713e587355a7921be96f725b00c19\n"
    },
    {
      "commit": "c8c40c71d6827b0edebac7fc93239987e5b69018",
      "tree": "5dbb678b87cca7ba2d784e3d7ddf3136e5bcdb94",
      "parents": [
        "128faae1c7d9454607f9923f5eb9c28497a599d4"
      ],
      "author": {
        "name": "Nate Jiang",
        "email": "qiangjiang@google.com",
        "time": "Fri May 17 10:53:18 2024 -0700"
      },
      "committer": {
        "name": "Nate Jiang",
        "email": "qiangjiang@google.com",
        "time": "Fri May 17 10:55:12 2024 -0700"
      },
      "message": "Add log for handle device shutdown\n\nBug: 337208274\nTest: atest com.android.server.wifi\nChange-Id: Ia7e923790ae3e556cbdf156d11426c92a22ee9f7\n"
    },
    {
      "commit": "128faae1c7d9454607f9923f5eb9c28497a599d4",
      "tree": "cb4c2c585c54d269cc8ea8b90567127fcc429388",
      "parents": [
        "a34128b6c1f751858917651012f5dc71ebdeede3",
        "b2b53ed021b492ccf6e2595503ae6bbccd4cc4bc"
      ],
      "author": {
        "name": "Yi Shiou (Les) Lee",
        "email": "lesl@google.com",
        "time": "Fri May 17 17:29:39 2024 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Fri May 17 17:29:39 2024 +0000"
      },
      "message": "Merge \"wifi: Refine the logging\" into main"
    },
    {
      "commit": "fb16ab27161e2839cf03373778a967571d32a3b9",
      "tree": "d16af15520208491a8d9a189c8132c5ed7057bd8",
      "parents": [
        "b2b53ed021b492ccf6e2595503ae6bbccd4cc4bc"
      ],
      "author": {
        "name": "Les Lee",
        "email": "lesl@google.com",
        "time": "Tue May 14 03:04:20 2024 +0000"
      },
      "committer": {
        "name": "Les Lee",
        "email": "lesl@google.com",
        "time": "Fri May 17 03:09:32 2024 +0000"
      },
      "message": "wifi: Move isWifiCall check to WifiCarrierInfoManager\n\nBug: 295885471\nTest: atest -c FrameworksWifiTests\nChange-Id: Ie21c43a28c913a70313c391737e2b3c37b5986e2\n"
    },
    {
      "commit": "a34128b6c1f751858917651012f5dc71ebdeede3",
      "tree": "2a0a27b12364691769891535c2b965610ef87253",
      "parents": [
        "6c5a96115060b7ca1e5b95e608a604649c0c9f3d"
      ],
      "author": {
        "name": "Les Lee",
        "email": "lesl@google.com",
        "time": "Wed May 08 23:17:29 2024 +0000"
      },
      "committer": {
        "name": "Les Lee",
        "email": "lesl@google.com",
        "time": "Thu May 16 20:26:05 2024 +0000"
      },
      "message": "wifi: Support to override config_wifiWepDeprecated by command\n\nAlso rename parameter and help content to make it more clear and alignment.\n\nBug: 338112654\nTest: atest -c FrameworksWifiTests\nTest: force-overlay-config-value true config_wifiWepDeprecated enabled\nTest: force-overlay-config-value false config_wifiWepDeprecated enabled\nTest: force-overlay-config-value true config_wifiWepDeprecated disabled\n\nChange-Id: I0b137e988717acaa9143325eba4d5b0d3d1e5abb\n"
    },
    {
      "commit": "b2b53ed021b492ccf6e2595503ae6bbccd4cc4bc",
      "tree": "fe820427510530781f529599973efadfba49871b",
      "parents": [
        "6c5a96115060b7ca1e5b95e608a604649c0c9f3d"
      ],
      "author": {
        "name": "Les Lee",
        "email": "lesl@google.com",
        "time": "Thu May 16 03:13:52 2024 +0000"
      },
      "committer": {
        "name": "Les Lee",
        "email": "lesl@google.com",
        "time": "Thu May 16 03:16:39 2024 +0000"
      },
      "message": "wifi: Refine the logging\n\nThe VoWifi capability may be changed during the VoWifi call but\nit keeps in VoWifi mode. Adds a local variable to refine the logging.\n\nBug: 295885471\nTest: atest -c FrameworksWifiTests\nChange-Id: Ib89d8385b86804ec1d9e7a1a75a4a3711c3eabb2\n"
    },
    {
      "commit": "6c5a96115060b7ca1e5b95e608a604649c0c9f3d",
      "tree": "a9127e9138a78565c27898e45d3739883d8a8ca1",
      "parents": [
        "05951e5585d0f16952038dc3f25e8c69e916b0a1",
        "c3730df038f3c302769f2c57d91da5e4f08ef430"
      ],
      "author": {
        "name": "Treehugger Robot",
        "email": "android-test-infra-autosubmit@system.gserviceaccount.com",
        "time": "Wed May 15 22:53:14 2024 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Wed May 15 22:53:14 2024 +0000"
      },
      "message": "Merge \"Make calculate MAC synchronized\" into main"
    },
    {
      "commit": "05951e5585d0f16952038dc3f25e8c69e916b0a1",
      "tree": "6bb4d19775153af0eda3dcd6633061401dcc4cb6",
      "parents": [
        "54837945519d5feeef5089b2e15d336bfa54079f",
        "2ddd22639831c1d77b404aaa7ced14a26c5f4286"
      ],
      "author": {
        "name": "Nate Jiang",
        "email": "qiangjiang@google.com",
        "time": "Wed May 15 22:33:03 2024 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Wed May 15 22:33:03 2024 +0000"
      },
      "message": "Merge \"Add timeout for scan when AP skip the user approval\" into main"
    },
    {
      "commit": "54837945519d5feeef5089b2e15d336bfa54079f",
      "tree": "b4348891d34bf81e5620c33192b55d48d25fb96d",
      "parents": [
        "643ddec98294d767838e48a7c329d708da8de30c",
        "ee0ab0d627831973d25a4a9cac9f6d3b860e4786"
      ],
      "author": {
        "name": "Yi Shiou (Les) Lee",
        "email": "lesl@google.com",
        "time": "Wed May 15 22:13:23 2024 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Wed May 15 22:13:23 2024 +0000"
      },
      "message": "Merge \"wifi: Detect Wifi OTT / VoWifi call\" into main"
    },
    {
      "commit": "643ddec98294d767838e48a7c329d708da8de30c",
      "tree": "5d4ce53013edeab00a72b442577a43a1bbe0e658",
      "parents": [
        "fcd387dfe6c7c8b8a5bff4c152e8f72d9171e3e2",
        "406a3a61c047047f44cd0ecf324ece8e13ed237a"
      ],
      "author": {
        "name": "Treehugger Robot",
        "email": "android-test-infra-autosubmit@system.gserviceaccount.com",
        "time": "Wed May 15 21:58:57 2024 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Wed May 15 21:58:57 2024 +0000"
      },
      "message": "Merge \"WifiServiceImpl:fix NPE in unregisterScanResultsCallback method when app send a null callbck.\" into main"
    },
    {
      "commit": "2b5864f80d07cb41870db9b3a876e36827bcb290",
      "tree": "cac53b98e9744d6636cd8c0ddf5b065e6775a8e8",
      "parents": [
        "fcd387dfe6c7c8b8a5bff4c152e8f72d9171e3e2"
      ],
      "author": {
        "name": "Aleti Nageshwar Reddy",
        "email": "quic_anageshw@quicinc.com",
        "time": "Wed May 15 18:44:51 2024 +0000"
      },
      "committer": {
        "name": "Oscar Shu",
        "email": "xshu@google.com",
        "time": "Wed May 15 18:47:46 2024 +0000"
      },
      "message": "Wifi: Fix TX/RX linkspeeds not updating properly on network details page\n\nFor every TX/RX linspeed change, WifiEntry class is not receiving the\nevent to let UI refresh the network details page screen. As it is not\ngetting updated, WifiEntry is sending older WifiInfo to UI. Fix the same\nby sending the event from ClientModeImpl for every TX/RX linkspeed change.\n(cherry picked from https://partner-android-review.googlesource.com/q/commit:5fbca57b7f7d636bd4c6c9bd770360813241d7b5)\n\nBug: 338553176\nTest: atest com.android.server.wifi\nMerged-In: Ifed3e501cdf8c87d6412147f294d958f783a76e5\nChange-Id: Ifed3e501cdf8c87d6412147f294d958f783a76e5\n"
    },
    {
      "commit": "ee0ab0d627831973d25a4a9cac9f6d3b860e4786",
      "tree": "18a0928213a8a7e739258c57b1682bcf64cc6bac",
      "parents": [
        "5d3af32eaacffe84b9fcfb76900fd8985b8fd080"
      ],
      "author": {
        "name": "Les Lee",
        "email": "lesl@google.com",
        "time": "Fri May 03 01:28:44 2024 +0000"
      },
      "committer": {
        "name": "Les Lee",
        "email": "lesl@google.com",
        "time": "Wed May 15 00:21:03 2024 +0000"
      },
      "message": "wifi: Detect Wifi OTT / VoWifi call\n\nCall hal when detecting Wifi OTT / VoWifi call.\nAlso skip the call when feature is not supported.\n\nBug: 295885471\nTest: atest -f FrameworksWifiTests\nTest: Manual tes with meet/wifi calling\nChange-Id: I4fead635caa0d8861bd2ed36e7bb7fdd9ab04bc0\n"
    },
    {
      "commit": "fcd387dfe6c7c8b8a5bff4c152e8f72d9171e3e2",
      "tree": "2224b916a5dbfbd844b9fbca42369b6911ed60e7",
      "parents": [
        "524aeab46b134435f1bcfc9843691a99ce7a3d9c",
        "63768e4c4bb86da1484c97d8ece1e421b9a6be2c"
      ],
      "author": {
        "name": "Treehugger Robot",
        "email": "android-test-infra-autosubmit@system.gserviceaccount.com",
        "time": "Mon May 13 23:22:19 2024 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Mon May 13 23:22:19 2024 +0000"
      },
      "message": "Merge \"Fix null pointer in candidate override corner case\" into main"
    },
    {
      "commit": "524aeab46b134435f1bcfc9843691a99ce7a3d9c",
      "tree": "20196c883f59bdc93d55b7e18a435a8e88bab359",
      "parents": [
        "738a4b0be30f4cd63c8848ae61504e44a5411a7d",
        "bd844f102de98fd4787ae8ce0f71b994327247f7"
      ],
      "author": {
        "name": "Stephanie Bak",
        "email": "dasol@google.com",
        "time": "Mon May 13 20:32:00 2024 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Mon May 13 20:32:00 2024 +0000"
      },
      "message": "Merge \"Fix：Very fast switching of GO leads to mGroups not being cleared from the system, affecting subsequent mGroup status determination\" into main"
    },
    {
      "commit": "738a4b0be30f4cd63c8848ae61504e44a5411a7d",
      "tree": "a109533e00660ee4bcdbb14bacd2173d83d9e892",
      "parents": [
        "51e4449e29c85a15591e6c5c89214cca7cc84f90",
        "c19983963f31a64cd97edb7976248cd036ef14d4"
      ],
      "author": {
        "name": "Nate Jiang",
        "email": "qiangjiang@google.com",
        "time": "Mon May 13 20:14:51 2024 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Mon May 13 20:14:51 2024 +0000"
      },
      "message": "Merge \"Disable link probe as it affects scan\" into main"
    },
    {
      "commit": "51e4449e29c85a15591e6c5c89214cca7cc84f90",
      "tree": "900c48ed330cd954485a63ab74a8e1e647f3034a",
      "parents": [
        "21ff67fbccf93375e6269d9951db45ec8e007e7a",
        "5d3af32eaacffe84b9fcfb76900fd8985b8fd080"
      ],
      "author": {
        "name": "Yi Shiou (Les) Lee",
        "email": "lesl@google.com",
        "time": "Mon May 13 19:51:02 2024 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Mon May 13 19:51:02 2024 +0000"
      },
      "message": "Merge \"wifi: Adds setVoipMode api call from WifiNative\" into main"
    },
    {
      "commit": "5d3af32eaacffe84b9fcfb76900fd8985b8fd080",
      "tree": "fbf6d483bdc9bd09d6ce946dd6f57d32b62363be",
      "parents": [
        "e30e9f816f31c67cfec441a8e97ccdee0b0f2fa1"
      ],
      "author": {
        "name": "Les Lee",
        "email": "lesl@google.com",
        "time": "Fri Apr 26 22:04:42 2024 +0000"
      },
      "committer": {
        "name": "Les Lee",
        "email": "lesl@google.com",
        "time": "Mon May 13 17:44:56 2024 +0000"
      },
      "message": "wifi: Adds setVoipMode api call from WifiNative\n\nNote: The feature flag will be gated in caller.\n\nBug: 295885471\nTest: atest -c FrameworksWifiTests\nChange-Id: I0ed9d3384ac4ead1367ca7bd25c4f5cb7b2ce8bb\n"
    },
    {
      "commit": "2ddd22639831c1d77b404aaa7ced14a26c5f4286",
      "tree": "619b7592eab305801e4519a3379cb66c48681de0",
      "parents": [
        "21ff67fbccf93375e6269d9951db45ec8e007e7a"
      ],
      "author": {
        "name": "Nate Jiang",
        "email": "qiangjiang@google.com",
        "time": "Wed May 08 11:11:32 2024 -0700"
      },
      "committer": {
        "name": "Nate Jiang",
        "email": "qiangjiang@google.com",
        "time": "Mon May 13 10:20:36 2024 -0700"
      },
      "message": "Add timeout for scan when AP skip the user approval\n\nFor the AP didn\u0027t get approved, UI has a timeout of scan to allow the\nuser cancel the request. Same as that, add a scan timeout for AP skip\nthe user approval to avoid infine scan.\n\nBug: 334470350\nTest: ates com.android.server.wifi\n\nChange-Id: I753f8c58ee953761298fa8bb6acb2b449c52f52e\n"
    },
    {
      "commit": "86e22d166e2313ea9131423c9e8270e8eb41351c",
      "tree": "d74092b6a66f031823d6e026c415a9f384ff1dd5",
      "parents": [
        "bc84d6ef29384d80aa45d35410a2b550f2d50e21"
      ],
      "author": {
        "name": "Quang Anh Luong",
        "email": "qal@google.com",
        "time": "Fri May 10 17:36:04 2024 +0900"
      },
      "committer": {
        "name": "Quang Anh Luong",
        "email": "qal@google.com",
        "time": "Fri May 10 17:36:04 2024 +0900"
      },
      "message": "Fix startTetheredHotspot failure during SAP teardown\n\nTethering may restart hotspot in case of a downstream prefix conflict.\nThe new call to startTetheredHotspot is triggered when the iface goes\ndown, but this may fail if the SAP state hasn\u0027t changed to DISABLED yet.\nTo fix this, set the state to DISABLED before tearing down the iface to\nensure startTetheredHotspot can be called immediately again.\n\nBug: 335478233\nTest: atest SoftApManagerTest\nChange-Id: Id31a6443091819dc576b67398f57196720d972ff\n"
    },
    {
      "commit": "406a3a61c047047f44cd0ecf324ece8e13ed237a",
      "tree": "dcf39fb94f3976375a3f2de31e8873ed10f96f89",
      "parents": [
        "3b9d5adf2f10c368c6a256c9a06d75836dc4eb82"
      ],
      "author": {
        "name": "lijilou",
        "email": "lijilou@xiaomi.corp-partner.google.com",
        "time": "Tue May 07 21:13:39 2024 +0800"
      },
      "committer": {
        "name": "Oscar Shu",
        "email": "xshu@google.com",
        "time": "Thu May 09 22:57:58 2024 +0000"
      },
      "message": "WifiServiceImpl:fix NPE in unregisterScanResultsCallback method when app send a null callbck.\n\nWifi service should not crash when receiving a null callback.\n\nBug: 339173982\nTest: atest com.android.server.wifi\nChange-Id: Icd91fbeceb2c25c65b6f82e8f61079faece37557\n"
    },
    {
      "commit": "63768e4c4bb86da1484c97d8ece1e421b9a6be2c",
      "tree": "041e9aec4ecc468b06beaedb48808576a58c197a",
      "parents": [
        "3b9d5adf2f10c368c6a256c9a06d75836dc4eb82"
      ],
      "author": {
        "name": "Oscar Shu",
        "email": "xshu@google.com",
        "time": "Thu May 09 00:36:22 2024 +0000"
      },
      "committer": {
        "name": "Oscar Shu",
        "email": "xshu@google.com",
        "time": "Thu May 09 00:36:22 2024 +0000"
      },
      "message": "Fix null pointer in candidate override corner case\n\nThis corner case only happens when there\u0027s a loop in the user connect\nchoice algorithm and the candidate scanResult is null. Avoid crashing in\nthis case is enough since follow up network selection already handle the\ncandiate scanResult being null properly.\n\nBug: 338560518\nTest: atest com.android.server.wifi\nChange-Id: I4aa7798941f20f4894cb5e8f1dfc4b447cf910c8\n"
    },
    {
      "commit": "c3730df038f3c302769f2c57d91da5e4f08ef430",
      "tree": "611f4dbf1368f5c887db815d02df45c074bbdf10",
      "parents": [
        "3b9d5adf2f10c368c6a256c9a06d75836dc4eb82"
      ],
      "author": {
        "name": "Oscar Shu",
        "email": "xshu@google.com",
        "time": "Thu May 09 00:02:52 2024 +0000"
      },
      "committer": {
        "name": "Oscar Shu",
        "email": "xshu@google.com",
        "time": "Thu May 09 00:02:52 2024 +0000"
      },
      "message": "Make calculate MAC synchronized\n\nNeed to make this synchronized since it could be called from both Binder\nthread and Wifi thread.\n\nBug: 335123235\nTest: build\nChange-Id: I88564a206d4d25cb119f3acab6d37151cfb99771\n"
    },
    {
      "commit": "21ff67fbccf93375e6269d9951db45ec8e007e7a",
      "tree": "64eb5eb9828ab5d7368bd8fbdbe91b038cb7fbb4",
      "parents": [
        "756f94d0916530a3430ae7e92f1e42d69efac33c",
        "2b944a38a62f46902e43cc146b93e671315c9db9"
      ],
      "author": {
        "name": "Stephanie Bak",
        "email": "dasol@google.com",
        "time": "Wed May 08 22:12:05 2024 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Wed May 08 22:12:05 2024 +0000"
      },
      "message": "Merge \"Update WifiWake enabled logic\" into main"
    },
    {
      "commit": "756f94d0916530a3430ae7e92f1e42d69efac33c",
      "tree": "08502e7713360a2ebfb0e7e2021b0d6d2f09025e",
      "parents": [
        "f979736bfb2b879a9aef7c99b1a7ac51f870dffe",
        "cb3454863231106092eb05028db60e9e32690cdc"
      ],
      "author": {
        "name": "Sunil Ravi",
        "email": "sunilravi@google.com",
        "time": "Wed May 08 17:08:19 2024 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Wed May 08 17:08:19 2024 +0000"
      },
      "message": "Merge \"Modified the check for Maximum Number of AKMs\" into main"
    },
    {
      "commit": "f979736bfb2b879a9aef7c99b1a7ac51f870dffe",
      "tree": "1574bc4ee148fb79ce91f78c70322033511c1985",
      "parents": [
        "160f2e3deefef2bded92d7df0c410fbfc4040826",
        "23ae9715922ce9b920d87ccf4b49218398e44024"
      ],
      "author": {
        "name": "Nate Jiang",
        "email": "qiangjiang@google.com",
        "time": "Tue May 07 23:52:45 2024 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Tue May 07 23:52:45 2024 +0000"
      },
      "message": "Merge \"Add target_sdk_version to Wifi snippets\" into main"
    },
    {
      "commit": "23ae9715922ce9b920d87ccf4b49218398e44024",
      "tree": "66f2f105c5e98411efdadae0c4d154b88912bbbe",
      "parents": [
        "309a9a8da1c2235dafa1b22edabc6c2b5a93041d"
      ],
      "author": {
        "name": "Nate Jiang",
        "email": "qiangjiang@google.com",
        "time": "Tue May 07 14:14:29 2024 -0700"
      },
      "committer": {
        "name": "Nate Jiang",
        "email": "qiangjiang@google.com",
        "time": "Tue May 07 14:14:29 2024 -0700"
      },
      "message": "Add target_sdk_version to Wifi snippets\n\nFix the \"Requires development platform ... but this is a\nrelease platform\" issue when install on legacy system\n\nBug: 330289937\nTest: build\nChange-Id: I6d3cd0320c87aa73bc34f417603ee0b4ac582205\n"
    },
    {
      "commit": "cb3454863231106092eb05028db60e9e32690cdc",
      "tree": "7441960670d8d2387a8406833749adb1c052371c",
      "parents": [
        "309a9a8da1c2235dafa1b22edabc6c2b5a93041d"
      ],
      "author": {
        "name": "Sunil Ravi",
        "email": "sunilravi@google.com",
        "time": "Tue May 07 00:37:39 2024 +0000"
      },
      "committer": {
        "name": "Sunil Ravi",
        "email": "sunilravi@google.com",
        "time": "Tue May 07 00:37:39 2024 +0000"
      },
      "message": "Modified the check for Maximum Number of AKMs\n\nThe Wi-Fi Alliance has introduced the WPA3 security update for Wi-Fi 7, which\nmandates cross-AKM (Authenticated Key Management) roaming between three AKMs\n(AKM: 24(SAE-EXT-KEY), AKM:8(SAE) and AKM:2(PSK)). If the station supports\nAKM 24(SAE-EXT-KEY), it is recommended to enable WPA3 SAE auto-upgrade offload,\nprovided that the driver indicates that the maximum number of AKM suites allowed in\nconnection requests is three or more.\n\nIf the driver doesn\u0027t indicate the maximum number of AKM suites,\nkernel defaults to 2. So the current check for maximum number of AKM\nto 2 doesn\u0027t guarantee that the driver supports cross-akm roaming.\nSo modified the check to 3 or more.\n\nBug: 336732588\nTest: atest ClientModeImplTest\nTest: Manual - Tested and confirmed from the logs that cross-akm feature\nis getting enabled.\n\nChange-Id: I60d1d923655f24922841a8ffa9c6b514558be70b\n"
    },
    {
      "commit": "160f2e3deefef2bded92d7df0c410fbfc4040826",
      "tree": "abb54076d8e79fdccc20d3c7eb06093cc53f5b71",
      "parents": [
        "0f75077bfa7653f283f1b0aa2444b4da86f52369",
        "2618c4384c8500c2691b36d76999eda99a36c048"
      ],
      "author": {
        "name": "Oscar Shu",
        "email": "xshu@google.com",
        "time": "Tue May 07 00:20:31 2024 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Tue May 07 00:20:31 2024 +0000"
      },
      "message": "Merge \"Fix unexpected KeyStore exception crash\" into main"
    },
    {
      "commit": "0f75077bfa7653f283f1b0aa2444b4da86f52369",
      "tree": "84fa604831681083e503cefeb24e9480469621dd",
      "parents": [
        "309a9a8da1c2235dafa1b22edabc6c2b5a93041d",
        "5695660bd0465a53ed52144930f7a5c785982e55"
      ],
      "author": {
        "name": "Treehugger Robot",
        "email": "android-test-infra-autosubmit@system.gserviceaccount.com",
        "time": "Mon May 06 19:38:00 2024 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Mon May 06 19:38:00 2024 +0000"
      },
      "message": "Merge \"Drop stale CMD_INTERFACE_DESTROYED message\" into main"
    },
    {
      "commit": "bd844f102de98fd4787ae8ce0f71b994327247f7",
      "tree": "0bae0ba0fb426501946588915af59364c65510a4",
      "parents": [
        "bda01c37d9798f4ebded5ef8dfc34249c7536484"
      ],
      "author": {
        "name": "Peiyong Wang",
        "email": "wangpeiyong@xiaomi.corp-partner.google.com",
        "time": "Tue Apr 23 09:08:07 2024 +0000"
      },
      "committer": {
        "name": "Stephanie Bak",
        "email": "dasol@google.com",
        "time": "Mon May 06 09:24:33 2024 +0000"
      },
      "message": "Fix：Very fast switching of GO leads to mGroups not being cleared from the system, affecting subsequent mGroup status determination\n\nThe above logic leads to: special scenario where mWifiNative.p2pGroupRemove is called and WifiP2pServiceImpl mGroup is not cleared. The result is that the mGroup information does not match the state of the Hal layer, and the upper layer using the WifiP2pManager#requestGroupInfo API can still get the information, which is considered to be a valid GroupInfo.\n\nSuggest to arrange to optimize this issue from system level as well: when mWifiNative.p2pGroupRemove is called, make sure that the mGroup cache information is also cleared at the same time, to avoid the problem of the information and the state not being Match.\n\nBug: 336469699\nTest: atest com.android.server.wifi\nChange-Id: I0173a74dff7c9f9c7d65b02be465b5a1b8440dd1\nSigned-off-by: Peiyong Wang \u003cwangpeiyong@xiaomi.corp-partner.google.com\u003e\n"
    },
    {
      "commit": "2b944a38a62f46902e43cc146b93e671315c9db9",
      "tree": "9b607ccba26dd6e258f7768478f88215ac373402",
      "parents": [
        "bda01c37d9798f4ebded5ef8dfc34249c7536484"
      ],
      "author": {
        "name": "Stephanie Bak",
        "email": "dasol@google.com",
        "time": "Mon May 06 05:44:22 2024 +0000"
      },
      "committer": {
        "name": "Stephanie Bak",
        "email": "dasol@google.com",
        "time": "Mon May 06 05:44:22 2024 +0000"
      },
      "message": "Update WifiWake enabled logic\n\nConsider feature to be enabled and ready when it is usable as well\n\nBug: 330819730\nTest: atest com.android.server.wifi\nChange-Id: I4955faa203600141a720c00e93aa67b347e2eb28\n"
    },
    {
      "commit": "309a9a8da1c2235dafa1b22edabc6c2b5a93041d",
      "tree": "e9a7b777578172487290cf324f47a648e7b4fa22",
      "parents": [
        "e30e9f816f31c67cfec441a8e97ccdee0b0f2fa1",
        "50b274940f707dac559e6f3503ff8f6f57402405"
      ],
      "author": {
        "name": "Oriol Prieto Gasco",
        "email": "opg@google.com",
        "time": "Fri May 03 14:52:26 2024 +0000"
      },
      "committer": {
        "name": "Automerger Merge Worker",
        "email": "android-build-automerger-merge-worker@system.gserviceaccount.com",
        "time": "Fri May 03 14:52:26 2024 +0000"
      },
      "message": "[automerger skipped] RESTRICT AUTOMERGE am: 6ac46ef90e am: 50b274940f -s ours\n\nam skip reason: contains skip directive\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/Wifi/+/3068206\n\nChange-Id: I5fd39efcabdbfdee31f57c084d6ea39b76acf6bc\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n"
    },
    {
      "commit": "50b274940f707dac559e6f3503ff8f6f57402405",
      "tree": "074619146aa7945593ca4c14c110211d50c17f86",
      "parents": [
        "0e2d2149a93481622b29fb6d78f75928a10e55b8",
        "6ac46ef90e32e323fb8b12807fd3bd0e420e0056"
      ],
      "author": {
        "name": "Oriol Prieto Gasco",
        "email": "opg@google.com",
        "time": "Fri May 03 14:25:56 2024 +0000"
      },
      "committer": {
        "name": "Automerger Merge Worker",
        "email": "android-build-automerger-merge-worker@system.gserviceaccount.com",
        "time": "Fri May 03 14:25:56 2024 +0000"
      },
      "message": "RESTRICT AUTOMERGE am: 6ac46ef90e\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/Wifi/+/3068206\n\nChange-Id: Ie27a6ac57cca1c44bd2f8687a4f4de7d3a76d241\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n"
    },
    {
      "commit": "6ac46ef90e32e323fb8b12807fd3bd0e420e0056",
      "tree": "074619146aa7945593ca4c14c110211d50c17f86",
      "parents": [
        "b32a92f7797242236684297464d80f1d6ad42175"
      ],
      "author": {
        "name": "Oriol Prieto Gasco",
        "email": "opg@google.com",
        "time": "Tue Apr 30 20:05:18 2024 +0000"
      },
      "committer": {
        "name": "Oriol Prieto Gascó",
        "email": "opg@google.com",
        "time": "Fri May 03 11:41:28 2024 +0000"
      },
      "message": "RESTRICT AUTOMERGE\nSet the container field of aconfig flags\n\nTest: printflags --format\u003d\u0027{package}:{container}:\u0027 | grep \"::\"\nBug: 312769710\nFlag: NONE\nChange-Id: I695e0e6df74abac60c26a8c1e5e6a476c4f13c26\n"
    },
    {
      "commit": "2618c4384c8500c2691b36d76999eda99a36c048",
      "tree": "ef44f3c8b4b22086d8701ab1c831ec09c8ccd98e",
      "parents": [
        "3b9d5adf2f10c368c6a256c9a06d75836dc4eb82"
      ],
      "author": {
        "name": "Oscar Shu",
        "email": "xshu@google.com",
        "time": "Fri May 03 01:10:55 2024 +0000"
      },
      "committer": {
        "name": "Oscar Shu",
        "email": "xshu@google.com",
        "time": "Fri May 03 01:10:55 2024 +0000"
      },
      "message": "Fix unexpected KeyStore exception crash\n\nThis unexpected exception is being seen on Android 11. Avoid the crash.\n\nBug: 323756172\nTest: compile\nChange-Id: I2fdab5c8fc7621053c9434395f1e0fe3afd15d0d\n"
    },
    {
      "commit": "c19983963f31a64cd97edb7976248cd036ef14d4",
      "tree": "6c6fc6ac5f9bc51cf5037bc805ccfbdf295bc429",
      "parents": [
        "e30e9f816f31c67cfec441a8e97ccdee0b0f2fa1"
      ],
      "author": {
        "name": "qiangjiang",
        "email": "qiangjiang@google.com",
        "time": "Fri May 03 00:01:21 2024 +0000"
      },
      "committer": {
        "name": "qiangjiang",
        "email": "qiangjiang@google.com",
        "time": "Fri May 03 00:02:43 2024 +0000"
      },
      "message": "Disable link probe as it affects scan\n\nWe only use it to get metrics. No action with the result.\n\nBug: 334984881\nTest: atest com.android.server.wifi\n\nChange-Id: Ia22a98f30864920ce2cb65317f48b83f6e15b35d\n"
    },
    {
      "commit": "e30e9f816f31c67cfec441a8e97ccdee0b0f2fa1",
      "tree": "e9a7b777578172487290cf324f47a648e7b4fa22",
      "parents": [
        "bc84d6ef29384d80aa45d35410a2b550f2d50e21",
        "0e2d2149a93481622b29fb6d78f75928a10e55b8"
      ],
      "author": {
        "name": "Treehugger Robot",
        "email": "android-test-infra-autosubmit@system.gserviceaccount.com",
        "time": "Wed May 01 14:36:04 2024 +0000"
      },
      "committer": {
        "name": "Automerger Merge Worker",
        "email": "android-build-automerger-merge-worker@system.gserviceaccount.com",
        "time": "Wed May 01 14:36:04 2024 +0000"
      },
      "message": "Merge \"A fix pairing test\" into main am: b32a92f779 am: 0e2d2149a9\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/Wifi/+/3046778\n\nChange-Id: Ie0fe75d5695b1b4270c84042350aae5b5403f2ec\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n"
    },
    {
      "commit": "0e2d2149a93481622b29fb6d78f75928a10e55b8",
      "tree": "2ec1834998b0a438f72ed97af17bef9fd85a6f2f",
      "parents": [
        "4e05841bfdddec5997ce5510bfae69814fb01dbb",
        "b32a92f7797242236684297464d80f1d6ad42175"
      ],
      "author": {
        "name": "Treehugger Robot",
        "email": "android-test-infra-autosubmit@system.gserviceaccount.com",
        "time": "Wed May 01 14:25:49 2024 +0000"
      },
      "committer": {
        "name": "Automerger Merge Worker",
        "email": "android-build-automerger-merge-worker@system.gserviceaccount.com",
        "time": "Wed May 01 14:25:49 2024 +0000"
      },
      "message": "Merge \"A fix pairing test\" into main am: b32a92f779\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/Wifi/+/3046778\n\nChange-Id: Ib04d3d5482f3180cdcb14c95701478ea971df7e3\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n"
    },
    {
      "commit": "b32a92f7797242236684297464d80f1d6ad42175",
      "tree": "2ec1834998b0a438f72ed97af17bef9fd85a6f2f",
      "parents": [
        "4ef8e26252a3b0f3f565d8e9995dbeaa5b7da384",
        "11c147e728008655e532b1997e04a1cdd698b1cb"
      ],
      "author": {
        "name": "Treehugger Robot",
        "email": "android-test-infra-autosubmit@system.gserviceaccount.com",
        "time": "Wed May 01 14:10:52 2024 +0000"
      },
      "committer": {
        "name": "Gerrit Code Review",
        "email": "noreply-gerritcodereview@google.com",
        "time": "Wed May 01 14:10:52 2024 +0000"
      },
      "message": "Merge \"A fix pairing test\" into main"
    },
    {
      "commit": "bc84d6ef29384d80aa45d35410a2b550f2d50e21",
      "tree": "61beb220ac173f07ceb94a038e895a7cd74f2078",
      "parents": [
        "30fc11103ec00b19a238a1d550f08039c796ac9f",
        "c749f7d815da97f77c398e8dce8320dcdcc85145"
      ],
      "author": {
        "name": "Oscar Shu",
        "email": "xshu@google.com",
        "time": "Tue Apr 30 22:09:29 2024 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Tue Apr 30 22:09:29 2024 +0000"
      },
      "message": "Merge \"Update currentNetwork after primary changes\" into main"
    },
    {
      "commit": "c749f7d815da97f77c398e8dce8320dcdcc85145",
      "tree": "06bdf93a0b50b194b0bae3531d17c4edfc3aea97",
      "parents": [
        "3b9d5adf2f10c368c6a256c9a06d75836dc4eb82"
      ],
      "author": {
        "name": "Oscar Shu",
        "email": "xshu@google.com",
        "time": "Tue Apr 30 17:54:04 2024 +0000"
      },
      "committer": {
        "name": "Oscar Shu",
        "email": "xshu@google.com",
        "time": "Tue Apr 30 18:21:36 2024 +0000"
      },
      "message": "Update currentNetwork after primary changes\n\nWhen the primary STA changes, update the current network to the new\nprimary\u0027s network. This is needed so the current network is updated\ncorrectly after MBB is complete.\n\nBug: 337192908\nTest: atest com.android.server.wifi\nChange-Id: I769dc21802a0245c3bc0e7fee36709467b0c2037\n"
    },
    {
      "commit": "11c147e728008655e532b1997e04a1cdd698b1cb",
      "tree": "738798cfcf1229d4c5948cc6572ac4eb7305f1e6",
      "parents": [
        "d91b853ade2d8b62f63d16f438ec7e144f715de3"
      ],
      "author": {
        "name": "Nate Jiang",
        "email": "qiangjiang@google.com",
        "time": "Wed Apr 17 17:43:07 2024 +0000"
      },
      "committer": {
        "name": "Nate Jiang",
        "email": "qiangjiang@google.com",
        "time": "Tue Apr 30 17:47:54 2024 +0000"
      },
      "message": "A fix pairing test\n\nBug: 333340424\nTest: atest CtsWifiAwareTestCases\n\nChange-Id: Ibb35cbaff590a69f2cee12a27a9e4833cf42ba60\n"
    },
    {
      "commit": "30fc11103ec00b19a238a1d550f08039c796ac9f",
      "tree": "006537a69944cf3f32e7e351681d96b6a5db7779",
      "parents": [
        "5416a5ea16b507bb3e350f72c7bbdb7fcb23b5a6",
        "4e05841bfdddec5997ce5510bfae69814fb01dbb"
      ],
      "author": {
        "name": "Quang Anh Luong",
        "email": "qal@google.com",
        "time": "Tue Apr 30 02:35:46 2024 +0000"
      },
      "committer": {
        "name": "Automerger Merge Worker",
        "email": "android-build-automerger-merge-worker@system.gserviceaccount.com",
        "time": "Tue Apr 30 02:35:46 2024 +0000"
      },
      "message": "[automerger skipped] Update Wifi V API stubs for API council am: 4ef8e26252 am: 4e05841bfd -s ours\n\nam skip reason: Merged-In Ia61560f774f884a935a464e2777e163d71042feb with SHA-1 6efb09ef25 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/Wifi/+/3054346\n\nChange-Id: Ida946c0ab346e63b2405102ac3713d6f8d8e18d5\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n"
    },
    {
      "commit": "4e05841bfdddec5997ce5510bfae69814fb01dbb",
      "tree": "3cbc6c024c42e4e1e8aac8f09c7431cbe49d0e52",
      "parents": [
        "a246bf977ff0e4f464a2c00f9ecc43ebda7b0c30",
        "4ef8e26252a3b0f3f565d8e9995dbeaa5b7da384"
      ],
      "author": {
        "name": "Quang Anh Luong",
        "email": "qal@google.com",
        "time": "Tue Apr 30 02:18:41 2024 +0000"
      },
      "committer": {
        "name": "Automerger Merge Worker",
        "email": "android-build-automerger-merge-worker@system.gserviceaccount.com",
        "time": "Tue Apr 30 02:18:41 2024 +0000"
      },
      "message": "Update Wifi V API stubs for API council am: 4ef8e26252\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/Wifi/+/3054346\n\nChange-Id: I64b11b19dcef411488131334207a4a21ac0f4303\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n"
    },
    {
      "commit": "5416a5ea16b507bb3e350f72c7bbdb7fcb23b5a6",
      "tree": "006537a69944cf3f32e7e351681d96b6a5db7779",
      "parents": [
        "0447bb3f79e854cb003f9023bb278e18293328b4",
        "a2f3f41c1af2ed719b465b09cc842f8c2ca673fe"
      ],
      "author": {
        "name": "Oscar Shu",
        "email": "xshu@google.com",
        "time": "Tue Apr 30 00:20:58 2024 +0000"
      },
      "committer": {
        "name": "Automerger Merge Worker",
        "email": "android-build-automerger-merge-worker@system.gserviceaccount.com",
        "time": "Tue Apr 30 00:20:58 2024 +0000"
      },
      "message": "[automerger skipped] Fix nullpointer for no candidate scanresult am: a2f3f41c1a -s ours\n\nam skip reason: Merged-In Iad212918966f68009ba7e98bb98f9ea0fc9a2611 with SHA-1 3d0c091c28 is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Wifi/+/27146407\n\nChange-Id: I1b28552368943a749e7746948814075d2b903a01\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n"
    },
    {
      "commit": "a2f3f41c1af2ed719b465b09cc842f8c2ca673fe",
      "tree": "9560af2fa0712fe06a887b6fb668c30967ef62e9",
      "parents": [
        "5f09068f58fd51d087bf2fb502e0b13103a336de"
      ],
      "author": {
        "name": "Oscar Shu",
        "email": "xshu@google.com",
        "time": "Thu Apr 25 00:23:04 2024 +0000"
      },
      "committer": {
        "name": "Oscar Shu",
        "email": "xshu@google.com",
        "time": "Mon Apr 29 21:45:22 2024 +0000"
      },
      "message": "Fix nullpointer for no candidate scanresult\n\nThis is a corner case that\u0027s only possible on devices that don\u0027t support\nfirmware roaming and somehow candidate scan result was not set.\n\nFix the null pointer and fallback to checking only SSID.\n\nBug: 336707946\nTest: atest com.android.server.wifi\nChange-Id: Iad212918966f68009ba7e98bb98f9ea0fc9a2611\nMerged-In: Iad212918966f68009ba7e98bb98f9ea0fc9a2611\n(cherry picked from commit 3d0c091c281123cc5fb8b36897ab629f3017d6c9)\n"
    },
    {
      "commit": "0447bb3f79e854cb003f9023bb278e18293328b4",
      "tree": "006537a69944cf3f32e7e351681d96b6a5db7779",
      "parents": [
        "7b9294f46b80dc2d253682e3de748cb64cbc4d2a",
        "3d0c091c281123cc5fb8b36897ab629f3017d6c9"
      ],
      "author": {
        "name": "Oscar Shu",
        "email": "xshu@google.com",
        "time": "Mon Apr 29 20:44:37 2024 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Mon Apr 29 20:44:37 2024 +0000"
      },
      "message": "Merge \"Fix nullpointer for no candidate scanresult\" into main"
    },
    {
      "commit": "7b9294f46b80dc2d253682e3de748cb64cbc4d2a",
      "tree": "a759e68f2df6422c5b9bace6a3808a72a196a84b",
      "parents": [
        "ead2a886340a43261627468fc51b8d3445ae3dfd",
        "ff4bb775cb8b2fefba176ee47b47f1053b8bc63f"
      ],
      "author": {
        "name": "Oscar Shu",
        "email": "xshu@google.com",
        "time": "Fri Apr 26 02:18:47 2024 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Fri Apr 26 02:18:47 2024 +0000"
      },
      "message": "Merge \"Additional cleanup during wifi disable\" into main"
    },
    {
      "commit": "ead2a886340a43261627468fc51b8d3445ae3dfd",
      "tree": "9843a51608456e7b26c24bd3a8acbcfe7c976ec8",
      "parents": [
        "d7fdf7dc4de29fd2f714f2bf39c15e0a52ec4108",
        "fe4dc20c6da0988790bc7f93b3285c4a46315205"
      ],
      "author": {
        "name": "Quang Luong",
        "email": "qal@google.com",
        "time": "Thu Apr 25 23:07:01 2024 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Thu Apr 25 23:07:01 2024 +0000"
      },
      "message": "Merge \"Move start-softap to privileged shell command\" into main"
    },
    {
      "commit": "4ef8e26252a3b0f3f565d8e9995dbeaa5b7da384",
      "tree": "3cbc6c024c42e4e1e8aac8f09c7431cbe49d0e52",
      "parents": [
        "d91b853ade2d8b62f63d16f438ec7e144f715de3"
      ],
      "author": {
        "name": "Quang Anh Luong",
        "email": "qal@google.com",
        "time": "Tue Apr 23 21:05:44 2024 +0900"
      },
      "committer": {
        "name": "Quang Luong",
        "email": "qal@google.com",
        "time": "Thu Apr 25 09:54:44 2024 +0000"
      },
      "message": "Update Wifi V API stubs for API council\n\nUpdate the Wifi V tethering APIs to reflect the changes made for the API\ncouncil.\n\nBug: 216524590\nTest: build\nChange-Id: Id5895e0ae8bf783c3d5146fda7619777f83ebf4f\nMerged-In: Ia61560f774f884a935a464e2777e163d71042feb\n"
    },
    {
      "commit": "3d0c091c281123cc5fb8b36897ab629f3017d6c9",
      "tree": "4a576801c8c32d6c7a5459af5778be711dd1e604",
      "parents": [
        "3b9d5adf2f10c368c6a256c9a06d75836dc4eb82"
      ],
      "author": {
        "name": "Oscar Shu",
        "email": "xshu@google.com",
        "time": "Thu Apr 25 00:23:04 2024 +0000"
      },
      "committer": {
        "name": "Oscar Shu",
        "email": "xshu@google.com",
        "time": "Thu Apr 25 00:23:04 2024 +0000"
      },
      "message": "Fix nullpointer for no candidate scanresult\n\nThis is a corner case that\u0027s only possible on devices that don\u0027t support\nfirmware roaming and somehow candidate scan result was not set.\n\nFix the null pointer and fallback to checking only SSID.\n\nBug: 336707946\nTest: atest com.android.server.wifi\nChange-Id: Iad212918966f68009ba7e98bb98f9ea0fc9a2611\n"
    },
    {
      "commit": "fe4dc20c6da0988790bc7f93b3285c4a46315205",
      "tree": "4be54ec7acf570701e3e425c107d68af740d3544",
      "parents": [
        "c64a6d483486a8719c0fb77794be2c187f5787de"
      ],
      "author": {
        "name": "Quang Anh Luong",
        "email": "qal@google.com",
        "time": "Fri Apr 19 10:36:17 2024 +0900"
      },
      "committer": {
        "name": "Quang Anh Luong",
        "email": "qal@google.com",
        "time": "Thu Apr 25 09:20:13 2024 +0900"
      },
      "message": "Move start-softap to privileged shell command\n\nstart-softap and stop-softap both require NETWORK_STACK permissions\nwhich Shell does not have (and nor should it). Thus, move these commands\nto the privileged shell command, as it requires root.\n\nBug: 335523845\nTest: build\nChange-Id: I14c5d1873459d7f9aaf0f0d59e7d5c2bcc1bc1c0\n"
    },
    {
      "commit": "d7fdf7dc4de29fd2f714f2bf39c15e0a52ec4108",
      "tree": "354c91e3474cf925c76e575b85aec27e884db89f",
      "parents": [
        "1532c75c3afb07e9c24237cf553f12f1164aa480",
        "1c668502f61ad975e74b766077e39ec4b9817d7e"
      ],
      "author": {
        "name": "Stephanie Bak",
        "email": "dasol@google.com",
        "time": "Wed Apr 24 23:35:25 2024 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Wed Apr 24 23:35:25 2024 +0000"
      },
      "message": "Merge \"Log mGroupClientIpProvisioningMode\" into main"
    },
    {
      "commit": "1532c75c3afb07e9c24237cf553f12f1164aa480",
      "tree": "f5f4154a820af70bf440603173ce0c36567ffc43",
      "parents": [
        "a0ed9d9df1b180183f6dd4f53c48a7ef7e575176",
        "2e3824f7a1fcb58b10d08af67d2c85d250ecdec2"
      ],
      "author": {
        "name": "Oscar Shu",
        "email": "xshu@google.com",
        "time": "Wed Apr 24 23:25:21 2024 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Wed Apr 24 23:25:21 2024 +0000"
      },
      "message": "Merge \"Log UID in wifi disconnect metric\" into main"
    },
    {
      "commit": "a0ed9d9df1b180183f6dd4f53c48a7ef7e575176",
      "tree": "c7ab897c860604e19fd3ee9d7e75dbe90c8002a7",
      "parents": [
        "a2e54943e1215dd6ab806cf340408d23e092a133",
        "5f09068f58fd51d087bf2fb502e0b13103a336de"
      ],
      "author": {
        "name": "Sunil Ravi",
        "email": "sunilravi@google.com",
        "time": "Wed Apr 24 21:56:31 2024 +0000"
      },
      "committer": {
        "name": "Automerger Merge Worker",
        "email": "android-build-automerger-merge-worker@system.gserviceaccount.com",
        "time": "Wed Apr 24 21:56:31 2024 +0000"
      },
      "message": "Merge \"Connection failure when SubjectAltName contains dNSName\" into udc-mainline-prod am: 5f09068f58\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Wifi/+/27073647\n\nChange-Id: I46e21bd1d678083b39da3c9e473f11eb33976cb4\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n"
    }
  ],
  "next": "5f09068f58fd51d087bf2fb502e0b13103a336de"
}
