summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-06-17DO NOT MERGE - Mark RQ3A.210410.001 as mergedtmp_sam_RQ3A.210605.005Xin Li
Bug: 190855093 Merged-In: Id05a2d639c24de48f83a26c1cae495b2f417874a Change-Id: I329e495f244ca88a6614fab3556eb1267720d35f
2021-06-18Merge "DO NOT MERGE - Merge ab/7272582" into stage-aosp-masterTreeHugger Robot
2021-06-17DO NOT MERGE - Merge ab/7272582Xin Li
Bug: 190855093 Merged-In: Ica9a871bef2ab0b64c27df0cb85ae3ce66dddd98 Change-Id: Id05a2d639c24de48f83a26c1cae495b2f417874a
2021-06-15Merge "Revert "Convert cld80211-lib/Android.mk to Android.bp"" am: 1ece7d8371Krzysztof Kosiński
Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/wlan/+/1738093 Change-Id: Ic84df5e923182f39037c1d8bd4ab3a33d9bba744
2021-06-15Merge "Revert "Convert cld80211-lib/Android.mk to Android.bp""Krzysztof Kosiński
2021-06-15Revert "Convert cld80211-lib/Android.mk to Android.bp"Krzysztof Kosiński
This reverts commit 8e7845456c6487190282dee5ab3034f48267b566. Reason for revert: breaks aosp_hawk-userdebug https://android-build.googleplex.com/builds/submitted/7460928/aosp_hawk-userdebug/latest/view/logs/build_error.log Change-Id: Ie9872bc5fb1f967c288a7ac3d6239acebd009d8b
2021-06-15Merge "Convert cld80211-lib/Android.mk to Android.bp" am: ffe5476966Yuntao Xu
Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/wlan/+/1687326 Change-Id: I3b5faf14cb4b8770b5b7e02283ef4c4c85b2ecf8
2021-06-15Merge "Convert cld80211-lib/Android.mk to Android.bp"Yuntao Xu
2021-06-01Convert cld80211-lib/Android.mk to Android.bpYuntao Xu
Convert the Make file to a Soong one Bug: 186462909 Test: compared the results built by Make and Soong Test: TreeHugger Change-Id: I91c5b37dee78672b0f75ec4542bc15031c6540bf
2021-02-26Snap for 7171164 from a9e1b56d1724d674b3ff8a35c5c6d69b69ac4ec6 to ↵android-11.0.0_r46android-11.0.0_r43android-11.0.0_r40android-11.0.0_r39android-11.0.0_r38android11-qpr3-s1-releaseandroid11-qpr3-releaseandroid-build-team Robot
rvc-qpr3-release Change-Id: I62076004e985dc30ba953d4bb1312685788fc1be
2021-02-25Sync qca-vendor_copy.h with latest hostap am: a9e1b56d17temp_ab_7272582Vinita S. Maloo
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/wlan/+/12835122 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I057b7e2fdc198e6cd9fd8c83fe7b19fe3c1beb41
2021-02-25wifi-hal: Add support to get CCA busy time due to other nodes am: 17eda87756Vinita S. Maloo
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/wlan/+/12835123 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ie1124542b065f69d434944cbc903b1e508f2f98a
2021-02-24Sync qca-vendor_copy.h with latest hostapVinita S. Maloo
This bring qca-vendor.h definitions as on 2020-09-03. Bug: 160239223 CRs-Fixed: 2766035 Change-Id: Ica9a871bef2ab0b64c27df0cb85ae3ce66dddd98
2021-02-23wifi-hal: Add support to get CCA busy time due to other nodesVinita S. Maloo
Add support to parse channel RX time using QCA vendor interface of LL stats, if supported by driver and report accurate CCA busy time. Currently the driver/firmware indicates CCA busy time which includes own RX time also and as such, CCA busy time reported by firmware is not accurate. Report accurate cca busy time to upper layers by subtracting self RX time reported by firmware. Bug: 160239223 Change-Id: I1218fce828b082d7145376e9fe7111c0e7bc5953 CRs-Fixed: 2766035
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 5ebe277587 -s oursXin Li
am skip reason: Change-Id I3612241499aebe0bd5e075dcd427a131ed3f90a7 with SHA-1 fbb82485fd is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ib25fd0fee13721f3a89cdeebe7312a2f2032a20a
2021-02-20Mark ab/7061308 as merged in stage.android-s-beta-2android-s-beta-1Xin Li
Bug: 180401296 Merged-In: I3612241499aebe0bd5e075dcd427a131ed3f90a7 Change-Id: I170991911964374571cf6c20408ce2bd5a4dd31f
2021-02-19Merge "[LSC] Add LOCAL_LICENSE_KINDS to hardware/qcom/wlan" am: 13f1ea7069 ↵Bob Badour
am: 52d5793831 Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/wlan/+/1588405 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I2a6ad72c083fd72555bea44b7950e867b772faa0
2021-02-19Merge "[LSC] Add LOCAL_LICENSE_KINDS to hardware/qcom/wlan" am: 13f1ea7069Bob Badour
Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/wlan/+/1588405 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I7f3efb5ecce83d0db64f5cd6a4e9f6aa69fcab2a
2021-02-18Merge "[LSC] Add LOCAL_LICENSE_KINDS to hardware/qcom/wlan"Bob Badour
2021-02-12[LSC] Add LOCAL_LICENSE_KINDS to hardware/qcom/wlanBob Badour
Added SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD to: qcwcn/wifi_hal/Android.mk Added SPDX-license-identifier-BSD to: cld80211-lib/Android.mk qcwcn/wcnss-service/Android.mk qcwcn/wpa_supplicant_8_lib/Android.mk Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: I96fbf1a03a023509049ad11765b6860ab344499f
2020-12-22Merge "wifi_hal: Fix access check of control param file" am: ceb0ec8e27 am: ↵Treehugger Robot
ce1e9e6e0e Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/wlan/+/1532349 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I3612241499aebe0bd5e075dcd427a131ed3f90a7
2020-12-22Merge "wifi_hal: Fix access check of control param file" am: ceb0ec8e27Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/wlan/+/1532349 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I17f7c3766b3a16c430ca0bac71fb1f8a451a2991
2020-12-22Merge "wifi_hal: Fix access check of control param file"android-s-preview-1Treehugger Robot
2020-12-17wifi_hal: Fix access check of control param filePablo Mendez Hernandez
Currently, the driver control param file is created write-only, so fix the check: https://android.googlesource.com/kernel/msm-modules/qcacld/+/refs/heads/android-msm-coral-4.14-android11-qpr1/core/hdd/src/wlan_hdd_main.c#190 More importantly the open below uses O_WRONLY as only a write is necessary, there is no need to check for read access. Otherwise, WiFi fails to be enabled: WifiHAL : Failed to access driver state control param Permission denied, 13 at /sys/kernel/boot_wlan/boot_wlan Fixes: 8996467be9 ("wifihal: Update driver control param to check driver is ready") Test: Manual build and functionality test Signed-off-by: Pablo Mendez Hernandez <pablomh@gmail.com> Signed-off-by: Marijn Suijten <marijn.suijten@somainline.org> Change-Id: If6308cd790c69d2d57815ef6815c779258005eff
2020-12-10[automerger skipped] Merge "DO NOT MERGE - Merge Android R QPR1" am: ↵Xin Li
32fa4f2dc5 -s ours am: bb5fe5242c -s ours am skip reason: Change-Id I7bc25bb7bd3bbfa255e399def0a786d3200bb737 with SHA-1 830cb6b349 is in history Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/wlan/+/1521192 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Idf41677c8f9c6dd711cf5b621dcf28b495bc173d
2020-12-10[automerger skipped] Merge "DO NOT MERGE - Merge Android R QPR1" am: ↵Xin Li
32fa4f2dc5 -s ours am skip reason: Change-Id I7bc25bb7bd3bbfa255e399def0a786d3200bb737 with SHA-1 830cb6b349 is in history Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/wlan/+/1521192 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I7dd3213ada75505a8e6a3e6518bdafdead1ea393
2020-12-10Merge "DO NOT MERGE - Merge Android R QPR1"Xin Li
2020-12-08DO NOT MERGE - Merge Android R QPR1Xin Li
Bug: 172690556 Merged-In: I7bc25bb7bd3bbfa255e399def0a786d3200bb737 Change-Id: I428f39135cb885e9d78a1e57473445d9755b434d
2020-12-03[automerger skipped] Merge rvc-qpr-dev-plus-aosp-without-vendor@6881855 am: ↵Xin Li
830cb6b349 -s ours am skip reason: Change-Id Ief2d409729de9413224773906ff892ea62893635 with SHA-1 22088b81ec is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/wlan/+/13122693 Change-Id: I9d9c72186d5f808c8d4228bb6330180ae95cce68
2020-11-23Merge rvc-qpr-dev-plus-aosp-without-vendor@6881855temp_rvc_qpr_mergeXin Li
Bug: 172690556 Merged-In: Ief2d409729de9413224773906ff892ea62893635 Change-Id: I7bc25bb7bd3bbfa255e399def0a786d3200bb737
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 53de7a6e4e -s ours am: ↵Xin Li
60671c827d -s ours am skip reason: Change-Id I582ab07ba12204e66e5d13a044a3bd7d18707961 with SHA-1 76f69d48af is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/wlan/+/12796471 Change-Id: I273d8e2b61735bf3a6ca454cf9958ab220d98d8e
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 53de7a6e4e -s oursXin Li
am skip reason: Change-Id I582ab07ba12204e66e5d13a044a3bd7d18707961 with SHA-1 76f69d48af is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/wlan/+/12796471 Change-Id: I8f4b98349b685fdfcf49892b4a971e343d2d2483
2020-10-08Skip ab/6749736 in stage.Xin Li
Merged-In: I582ab07ba12204e66e5d13a044a3bd7d18707961 Change-Id: I36d080065266e8cf73bc2eb5510f9e47e05c93f2
2020-09-11[automerger skipped] Merge "Merge Android R" am: 7bddc5a998 -s ours am: ↵Xin Li
e6a92a64e4 -s ours am: 29911e94bc -s ours am: 5ec0ee2680 -s ours am skip reason: Change-Id I3a68890be6d2c62299703dea85b8aad11771e5bc with SHA-1 0b2dbb4621 is in history Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/wlan/+/1422137 Change-Id: Ief2d409729de9413224773906ff892ea62893635
2020-09-11[automerger skipped] Merge "Merge Android R" am: 7bddc5a998 -s ours am: ↵Xin Li
e6a92a64e4 -s ours am: 29911e94bc -s ours am skip reason: Change-Id I3a68890be6d2c62299703dea85b8aad11771e5bc with SHA-1 0b2dbb4621 is in history Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/wlan/+/1422137 Change-Id: I22c537cff79403eec3d382ca215a34643fe50bbd
2020-09-11[automerger skipped] Merge "Merge Android R" am: 7bddc5a998 -s ours am: ↵Xin Li
e6a92a64e4 -s ours am skip reason: Change-Id I3a68890be6d2c62299703dea85b8aad11771e5bc with SHA-1 0b2dbb4621 is in history Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/wlan/+/1422137 Change-Id: I6c65214492cbda07bf174e1cf7dbbc9b032995a6
2020-09-11[automerger skipped] Merge "Merge Android R" am: 7bddc5a998 -s oursXin Li
am skip reason: Change-Id I3a68890be6d2c62299703dea85b8aad11771e5bc with SHA-1 0b2dbb4621 is in history Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/wlan/+/1422137 Change-Id: I6b2de33adeec2ea771285910e411f494a841310e
2020-09-10Merge "Merge Android R"Xin Li
2020-09-08Merge Android RXin Li
Bug: 168057903 Merged-In: I3a68890be6d2c62299703dea85b8aad11771e5bc Change-Id: I2a6db130c8057ccdda76ad04f16b4b0dd9bbf6aa
2020-09-01[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: 0b2dbb4621 -s ours am: e6b2fcbe36 -s ours am: c1ad4e910a -s ours am skip reason: Change-Id I02faff3060bda901a2315693d8921c9280dc84bf with SHA-1 526dbaecb4 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/wlan/+/12470245 Change-Id: I49d573c0863e47e2601910ae56f624fcf959e5d6
2020-09-01[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: 0b2dbb4621 -s ours am: e6b2fcbe36 -s ours am skip reason: Change-Id I02faff3060bda901a2315693d8921c9280dc84bf with SHA-1 526dbaecb4 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/wlan/+/12470245 Change-Id: Ica41b298635be70a81b4390ae31a2133d4c784c7
2020-09-01[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: 0b2dbb4621 -s ours am skip reason: Change-Id I02faff3060bda901a2315693d8921c9280dc84bf with SHA-1 526dbaecb4 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/wlan/+/12470245 Change-Id: I157bf4af67497999bddbe1069d210c00c6918f9d
2020-08-27Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)temp_sam_168057903Xin Li
Bug: 166295507 Merged-In: I02faff3060bda901a2315693d8921c9280dc84bf Change-Id: I3a68890be6d2c62299703dea85b8aad11771e5bc
2020-08-12wifihal: Update driver control param to check driver is ready am: 8996467be9Veerendranath Jakkam
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/wlan/+/12124604 Change-Id: I66a07245e99c42da53a0bd6d2a0c8baf986fa535
2020-08-11wifihal: Update driver control param to check driver is readyandroid-11.0.0_r37android-11.0.0_r36android-11.0.0_r35android-11.0.0_r34android-11.0.0_r33android-11.0.0_r32android-11.0.0_r30android11-qpr2-releaseandroid11-qpr1-c-releaseVeerendranath Jakkam
Write driver control param and wait for successful update to make sure driver is ready in LONU model. Bug: 157090295 Test: Basic function test, SSR test Change-Id: Ia1a690305266baafabe4c2557723f464ca858db1
2020-06-08[automerger skipped] Merge "Merge QQ3A.200605.002 into master" am: ↵Xin Li
64500046a9 -s ours am: cc730ec4a1 -s ours am: 526dbaecb4 -s ours am: 76f69d48af -s ours am skip reason: Change-Id I4ac4d460106ac3b242e9bfd714e1dedb5b9bbd67 with SHA-1 650e783d44 is in history Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/wlan/+/1323622 Change-Id: I4c4636470abf7417db1422e28fc993a01c561a2c
2020-06-08[automerger skipped] Merge "Merge QQ3A.200605.002 into master" am: ↵Xin Li
64500046a9 -s ours am: cc730ec4a1 -s ours am: 526dbaecb4 -s ours am skip reason: Change-Id I4ac4d460106ac3b242e9bfd714e1dedb5b9bbd67 with SHA-1 650e783d44 is in history Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/wlan/+/1323622 Change-Id: I582ab07ba12204e66e5d13a044a3bd7d18707961
2020-06-08[automerger skipped] Merge "Merge QQ3A.200605.002 into master" am: ↵Xin Li
64500046a9 -s ours am: cc730ec4a1 -s ours am skip reason: Change-Id I4ac4d460106ac3b242e9bfd714e1dedb5b9bbd67 with SHA-1 650e783d44 is in history Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/wlan/+/1323622 Change-Id: I02faff3060bda901a2315693d8921c9280dc84bf
2020-06-08[automerger skipped] Merge "Merge QQ3A.200605.002 into master" am: ↵Xin Li
64500046a9 -s ours am skip reason: Change-Id I4ac4d460106ac3b242e9bfd714e1dedb5b9bbd67 with SHA-1 650e783d44 is in history Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/wlan/+/1323622 Change-Id: Ie3c69c4ca903ca4946a0496047ee0841279d2149
2020-06-06Merge "Merge QQ3A.200605.002 into master"android-r-beta-3android-r-beta-2Xin Li