summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2024-04-17Merge "Update references to internal libnl headers." into mainHEADmastermainRenato Grottesi
2024-04-16Update references to internal libnl headers.Christopher Ferris
Allow the code to compile with new version of libnl. Also remove unneeded references to internal libnl includes. Bug: 335246319 Test: Builds. Change-Id: Ibd17da006480890fcfd802b3d9c415af986c116d
2024-03-07Merge "Merge Android 14 QPR2 to AOSP main" into mainXin Li
2024-03-06Merge Android 14 QPR2 to AOSP mainXin Li
Bug: 319669529 Merged-In: I8a52247f6829310c7cac004987a1432932d280a8 Change-Id: Ic0f90244531e9694ff6a911e7d58f19d379685fe
2024-01-17Merge Android 24Q1 Release (ab/11220357)temp_319669529Xin Li
Bug: 319669529 Merged-In: I308e44fd20ab42f76a8bbcb3e872bfd0074c3aaa Change-Id: I8a52247f6829310c7cac004987a1432932d280a8
2023-12-11[automerger skipped] Merge "Merge Android 14 QPR1" into main am: 989e4c7817 ↵Xin Li
-s ours am: de49e44656 -s ours am: c31f475446 -s ours am skip reason: Merged-In I808dfb87fcc7e2a7e7e7353e911e531c960f6cac with SHA-1 6449edca35 is already in history Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/wlan/+/2866395 Change-Id: I19a6402f7cb34ab8cb282341a09eab29766c72b4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-11[automerger skipped] Merge Android 14 QPR1 am: d139286a6b -s ours am: ↵Xin Li
cabc3e913d -s ours am: fc6f83bb22 -s ours am skip reason: Merged-In I808dfb87fcc7e2a7e7e7353e911e531c960f6cac with SHA-1 6449edca35 is already in history Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/wlan/+/2866395 Change-Id: Idc787def0d63587645e17b4f3c8027e1e25c3b96 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-11[automerger skipped] Merge "Merge Android 14 QPR1" into main am: 989e4c7817 ↵Xin Li
-s ours am: de49e44656 -s ours am skip reason: Merged-In I808dfb87fcc7e2a7e7e7353e911e531c960f6cac with SHA-1 6449edca35 is already in history Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/wlan/+/2866395 Change-Id: I4416dbfd99398eb6a118feaf1c58c6d93036a10e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-11[automerger skipped] Merge Android 14 QPR1 am: d139286a6b -s ours am: ↵Xin Li
cabc3e913d -s ours am skip reason: Merged-In I808dfb87fcc7e2a7e7e7353e911e531c960f6cac with SHA-1 6449edca35 is already in history Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/wlan/+/2866395 Change-Id: I0ee65f8b85c213a955c18891d06e16a9f0a790cb Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-11[automerger skipped] Merge "Merge Android 14 QPR1" into main am: 989e4c7817 ↵Xin Li
-s ours am skip reason: Merged-In I808dfb87fcc7e2a7e7e7353e911e531c960f6cac with SHA-1 6449edca35 is already in history Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/wlan/+/2866395 Change-Id: I4937d59cf7774fb8f3343f4ad56f69aa11ab3b3c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-11[automerger skipped] Merge Android 14 QPR1 am: d139286a6b -s oursXin Li
am skip reason: Merged-In I808dfb87fcc7e2a7e7e7353e911e531c960f6cac with SHA-1 6449edca35 is already in history Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/wlan/+/2866395 Change-Id: I76a58125f80dc8c051b967fa206980a9c1d60f45 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-09Merge "Merge Android 14 QPR1" into mainXin Li
2023-12-08Merge Android 14 QPR1Xin Li
Merged-In: I808dfb87fcc7e2a7e7e7353e911e531c960f6cac Bug: 315507370 Change-Id: I73b6f23f95124e580a247ef1aa36d4c67e63ac91
2023-11-21Android.bp: Point wcn3990 to hardware/qcom/sw5100/wlanBen Fennema
Test: hardware/qcom/wlan/legacy not built when board_wlan_chip set to wcn3990 Bug: 311106895 Change-Id: I308e44fd20ab42f76a8bbcb3e872bfd0074c3aaa Signed-off-by: Ben Fennema <fennema@google.com>
2023-10-19[automerger skipped] Merge 10952656 am: 6449edca35 -s ours am: 12aeb8d8a5 -s ↵Xin Li
ours am skip reason: Merged-In I7dd486ed2d1a759cefce3c6942bcb7c5e4d4b002 with SHA-1 220ec2a111 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/wlan/+/25091724 Change-Id: Ie005e36ada1a601fac4503690065841b952c3490 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-19[automerger skipped] Merge 10952656 am: 6449edca35 -s oursXin Li
am skip reason: Merged-In I7dd486ed2d1a759cefce3c6942bcb7c5e4d4b002 with SHA-1 220ec2a111 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/wlan/+/25091724 Change-Id: Ia3d67a84e934a2025f110c646636268c0f0fed7d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-17Merge 10952656tmp_amf_315507370Xin Li
Merged-In: I7dd486ed2d1a759cefce3c6942bcb7c5e4d4b002 Change-Id: I808dfb87fcc7e2a7e7e7353e911e531c960f6cac
2023-10-08WifiHal:Add Null check for mInfo and sockHsiu-Chang Chen
If Wifi is turned off during the power save request is in process, there is a chance of socket or wifiInfo becoming NULL Add a null check to block the call to NULL pointer. Bug: 296957095 Test: Regression Test Change-Id: Ibe6253591c6852e38378579fda67f0055612055a CRs-Fixed: 3609145
2023-10-07[automerger skipped] Merge "Merge Android 14" into main am: 24412146ae -s ↵Xin Li
ours am: 4a67e2ca0b -s ours am: 7036f724d4 -s ours am: 9b2e6a3c07 -s ours am: 220ec2a111 -s ours am skip reason: Merged-In I11241d2d05382d899ac6e1602fc054903d085206 with SHA-1 e8617b4f8f is already in history Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/wlan/+/2776971 Change-Id: I015fa5466ae33ba0bc79ad8c27d885520e010e48 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-07[automerger skipped] Merge Android 14 am: 9fd2993a76 -s ours am: b9b39285cb ↵Xin Li
-s ours am: 4ac054a07e -s ours am: 53e441547c -s ours am: a68e8ee05d -s ours am skip reason: Merged-In I11241d2d05382d899ac6e1602fc054903d085206 with SHA-1 e8617b4f8f is already in history Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/wlan/+/2776971 Change-Id: I53750fefed98ec05ddf3bce835b340c7d23458e2 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06[automerger skipped] Merge "Merge Android 14" into main am: 24412146ae -s ↵Xin Li
ours am: 4a67e2ca0b -s ours am: 7036f724d4 -s ours am: 9b2e6a3c07 -s ours am skip reason: Merged-In I11241d2d05382d899ac6e1602fc054903d085206 with SHA-1 e8617b4f8f is already in history Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/wlan/+/2776971 Change-Id: I7dd486ed2d1a759cefce3c6942bcb7c5e4d4b002 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06[automerger skipped] Merge Android 14 am: 9fd2993a76 -s ours am: b9b39285cb ↵Xin Li
-s ours am: 4ac054a07e -s ours am: 53e441547c -s ours am skip reason: Merged-In I11241d2d05382d899ac6e1602fc054903d085206 with SHA-1 e8617b4f8f is already in history Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/wlan/+/2776971 Change-Id: I33a6f39a991b546eacb6bb8650d378a8f7b22c74 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06[automerger skipped] Merge "Merge Android 14" into main am: 24412146ae -s ↵Xin Li
ours am: 4a67e2ca0b -s ours am: 7036f724d4 -s ours am skip reason: Merged-In I11241d2d05382d899ac6e1602fc054903d085206 with SHA-1 e8617b4f8f is already in history Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/wlan/+/2776971 Change-Id: I0c6b5e4338bf8717779745d452defe6ceb0c5c89 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06[automerger skipped] Merge Android 14 am: 9fd2993a76 -s ours am: b9b39285cb ↵Xin Li
-s ours am: 4ac054a07e -s ours am skip reason: Merged-In I11241d2d05382d899ac6e1602fc054903d085206 with SHA-1 e8617b4f8f is already in history Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/wlan/+/2776971 Change-Id: I0470c99b1171c99073aea3590d35ab365d48f726 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06[automerger skipped] Merge "Merge Android 14" into main am: 24412146ae -s ↵Xin Li
ours am: 4a67e2ca0b -s ours am skip reason: Merged-In I11241d2d05382d899ac6e1602fc054903d085206 with SHA-1 e8617b4f8f is already in history Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/wlan/+/2776971 Change-Id: Id905ad1884d6f8df01fc92396460c8ed367310e0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06[automerger skipped] Merge Android 14 am: 9fd2993a76 -s ours am: b9b39285cb ↵Xin Li
-s ours am skip reason: Merged-In I11241d2d05382d899ac6e1602fc054903d085206 with SHA-1 e8617b4f8f is already in history Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/wlan/+/2776971 Change-Id: I9a824f2671e8a861feb615ae9bb9882b186306f9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06[automerger skipped] Merge "Merge Android 14" into main am: 24412146ae -s oursXin Li
am skip reason: Merged-In I11241d2d05382d899ac6e1602fc054903d085206 with SHA-1 e8617b4f8f is already in history Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/wlan/+/2776971 Change-Id: If48a1f648ab844ac05ac51f8437a563a7b00cb2e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06[automerger skipped] Merge Android 14 am: 9fd2993a76 -s oursXin Li
am skip reason: Merged-In I11241d2d05382d899ac6e1602fc054903d085206 with SHA-1 e8617b4f8f is already in history Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/wlan/+/2776971 Change-Id: Ibe28cf38fc07f64a4f367b4f964adeee05d9799d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06Merge "Merge Android 14" into mainXin Li
2023-10-05Merge Android 14Xin Li
Bug: 298295554 Merged-In: I11241d2d05382d899ac6e1602fc054903d085206 Change-Id: Ic980b07b43b90f33c9b407a8fa967ed0b93b3f3b
2023-08-29[automerger skipped] Merge Android U (ab/10368041) am: b09332f17f -s ours ↵Xin Li
am: fa8224e5f5 -s ours am: 5c98bc336f -s ours am: 8f1c2717e8 -s ours am skip reason: Merged-In I844532ebf0ed90a99a92ee22b7f06188795d1135 with SHA-1 42d98eb9f4 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/wlan/+/24181673 Change-Id: Idd149c40faf0fd8406dab7a2f9c010c1a5adb03c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-29[automerger skipped] Merge Android U (ab/10368041) am: b09332f17f -s ours ↵Xin Li
am: fa8224e5f5 -s ours am: 5c98bc336f -s ours am skip reason: Merged-In I844532ebf0ed90a99a92ee22b7f06188795d1135 with SHA-1 42d98eb9f4 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/wlan/+/24181673 Change-Id: I4aab3d4f2ff672387917cdcb89a65c7699b62c60 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-29[automerger skipped] Merge Android U (ab/10368041) am: b09332f17f -s ours ↵Xin Li
am: fa8224e5f5 -s ours am skip reason: Merged-In I844532ebf0ed90a99a92ee22b7f06188795d1135 with SHA-1 42d98eb9f4 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/wlan/+/24181673 Change-Id: Icd6aeb25d352da6204721676f9bc920372b67fc7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-28[automerger skipped] Merge Android U (ab/10368041) am: b09332f17f -s oursXin Li
am skip reason: Merged-In I844532ebf0ed90a99a92ee22b7f06188795d1135 with SHA-1 42d98eb9f4 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/wlan/+/24181673 Change-Id: I7a9861a0515782901d4a6691ccb9c846107b98a2 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-14Merge Android U (ab/10368041)tmp_amf_298295554Xin Li
Bug: 291102124 Merged-In: I844532ebf0ed90a99a92ee22b7f06188795d1135 Change-Id: I310ed529aa79772449335166338bea545b8a7367
2023-07-20Map WIFI_LATENCY_MODE_LOW to LOW latency mode am: ac07b99c6d am: 673f17d2b2Hsiu-Chang Chen
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/wlan/+/24139969 Change-Id: Id26c95c4fba488c5d55ae4fb9690fb94144900ac Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-20Map WIFI_LATENCY_MODE_LOW to LOW latency mode am: ac07b99c6dHsiu-Chang Chen
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/wlan/+/24139969 Change-Id: Ibd904298a6b50bade2a68da5a1b16a30cd8b637d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-20Map WIFI_LATENCY_MODE_LOW to LOW latency modeHsiu-Chang Chen
Align the mapping with other projects. Mapping to Ultralow latency mode will block host scan. Bug: 288633289 Test: halutil -latency Change-Id: Icff91219bbb7e83a68661c5a4e27043e35e22d00
2023-06-30Add null check for on_rtt_result_v2 am: d96c661e97 am: 43f4617e69Khanjan Desai
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/wlan/+/23727220 Change-Id: I1093fcb142906a3166ba41781b5266fc9dd6c5d1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-30Add null check for on_rtt_result_v2 am: d96c661e97Khanjan Desai
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/wlan/+/23727220 Change-Id: I2dddc42c520543073730ab4a09340cf34b50ee30 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-17Add null check for on_rtt_result_v2Khanjan Desai
Either on_rtt_results or on_rtt_results_v2 can be NULL as only one callback will be enabled for Lowi RTT. As Such, INVALID_ARGS will be considerd if both are NULL. Bug: 261366015 Test: Regression Test Change-Id: Ib056f23bf1e602e4ab7f3d9660675f1e3aef50f0 CRs-Fixed: 3452947
2023-06-09Merge "wifiHal:Skip invalid channel when setting unsafe channels" into ↵Treehugger Robot
udc-dev am: cc29ccec90 am: 4705f39cc5 Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/wlan/+/23225162 Change-Id: I718e116ecb7cb4bca6ade971043520337de01251 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-09Merge "wifihal: Mask pub_sub_id to single byte" into udc-dev am: 53a1029d0e ↵TreeHugger Robot
am: 8276cef115 Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/wlan/+/23104839 Change-Id: I4842bebe628fc173ddfb0c003f4d2c2ec13dd694 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-09wifihal: Mask pub_sub_id to single byte am: 57b8748613 am: 408f40b269Hsiu-Chang Chen
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/wlan/+/23236337 Change-Id: I4d772e39453f909bc448c997f0c7a8fbcbc02d2c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-18Merge "wifiHal:Skip invalid channel when setting unsafe channels" into ↵Treehugger Robot
udc-dev am: cc29ccec90 am: d3df581cab am: e85357780d am: fc55da3571 Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/wlan/+/23225162 Change-Id: I32697112988a3ad14110d28a8e13c98e1abaa4d0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-18Merge "wifiHal:Skip invalid channel when setting unsafe channels" into ↵Treehugger Robot
udc-dev am: cc29ccec90 am: d3df581cab am: e85357780d Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/wlan/+/23225162 Change-Id: I1d62261b360ec506a1ad413990ad784825c51657 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-18Merge "wifiHal:Skip invalid channel when setting unsafe channels" into ↵Treehugger Robot
udc-dev am: cc29ccec90 am: 42d98eb9f4 am: 20c67d96a6 am: b2c2745ee6 Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/wlan/+/23225162 Change-Id: Ia56ffbfea9d215b8b3d58670e79440adabf47b29 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-18Merge "wifiHal:Skip invalid channel when setting unsafe channels" into ↵Treehugger Robot
udc-dev am: cc29ccec90 am: d3df581cab am: 2eb7a9444f am: 26774ee9d4 Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/wlan/+/23225162 Change-Id: I755b395001ee14e4019cb47ffd3505b23652fb97 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-18Merge "wifiHal:Skip invalid channel when setting unsafe channels" into ↵Treehugger Robot
udc-dev am: cc29ccec90 am: 42d98eb9f4 am: 20c67d96a6 Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/wlan/+/23225162 Change-Id: Ia26c989839c321b70b6b8a222afc1b3a196ec0b4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-18Merge "wifiHal:Skip invalid channel when setting unsafe channels" into ↵Treehugger Robot
udc-dev am: cc29ccec90 am: d3df581cab am: 2eb7a9444f Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/wlan/+/23225162 Change-Id: If40d0bcc55f6f81806cffa561d9b2c3c46916ba3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-03 17:16:09 +0000