summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-09-11[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into ↵Xin Li
stage-aosp-master am: c26793c451 -s ours am skip reason: change_id I5d1305694de7dd89a12b59c61507fcaa7cb41d6a with SHA1 465ba7cca5 is in history Change-Id: Ib5f58dcbf26dfb65880a16400ee07fe15b39ae57
2019-09-08Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-masterXin Li
Bug: 135460123 Change-Id: Id022e08ea363a24bd34126df903e6fe070bafe42 Merged-In: I5d1305694de7dd89a12b59c61507fcaa7cb41d6a
2019-09-05[automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master" am: ↵Xin Li
180ce9e724 -s ours am: fe8fc84b59 am: fb336e9956 am: 9c8f60bf44 -s ours am skip reason: subject contains skip directive Change-Id: I51b85e8ba1f11efedaec840f550e22c6f80ecd4b
2019-09-05[automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master" am: ↵Xin Li
180ce9e724 -s ours am: fe8fc84b59 am: fb336e9956 Change-Id: Iaff8ba69d92a2106c8835a8560efda4266c0db46
2019-09-05[automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master" am: ↵Xin Li
180ce9e724 -s ours am: fe8fc84b59 Change-Id: Ie2bbf5da3eb772c73a934290beb0172fc10b545c
2019-09-05[automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master"Xin Li
am: 180ce9e724 -s ours am skip reason: subject contains skip directive Change-Id: If72a7c5fa6e8d6bac880a9e5fc10b63da993cd02
2019-09-05Merge "DO NOT MERGE - Merge Android 10 into master"ndk-sysroot-r21Xin Li
2019-09-04DO NOT MERGE - Merge Android 10 into masterXin Li
Bug: 139893257 Change-Id: I5d1305694de7dd89a12b59c61507fcaa7cb41d6a
2019-07-02[automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor ↵Xin Li
(5699924) into stage-aosp-master am: 6e67c53763 am: 5c3be09976 -s ours am skip reason: subject contains skip directive Change-Id: I77b2daaf56383c12d3e9ccadcf6bb18962e5a037
2019-07-02DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into ↵Xin Li
stage-aosp-master am: 6e67c53763 Change-Id: I6ec117bcd920a42b09237409c4d50feb18b0c55f
2019-07-01DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into ↵temp_140451723Xin Li
stage-aosp-master Bug: 134405016 Change-Id: I6785097384d1b21c6ad19027dd4ce297114a66d4
2019-06-27Snap for 5691653 from f2edcbeb9bc05eab416bd985744c98c14c020799 to ↵android-10.0.0_r9android-10.0.0_r8android-10.0.0_r7android-10.0.0_r14android-10.0.0_r13android-10.0.0_r12android10-c2f2-s2-releaseandroid10-c2f2-s1-releaseandroid10-c2f2-releaseandroid-build-team Robot
qt-c2f2-release Change-Id: I727fa0c4261f9a03d90932e3d7f686962e86edae
2019-06-26Merge "WIFIHAL: Fix use-after-free issue while freeing monitor socket list" ↵Vinay Gannevaram
into qt-r1-dev am: f2edcbeb9b am: 4bc52a3597 Change-Id: I1a420f702c17d028e33be09806d47eb7df6c3179
2019-06-26Merge "WIFIHAL: Fix use-after-free issue while freeing monitor socket list" ↵Vinay Gannevaram
into qt-r1-dev am: f2edcbeb9b Change-Id: I20557bfdbd095f1e1a8b47c8c860092cb7ad99c4
2019-06-26Merge "WIFIHAL: Fix use-after-free issue while freeing monitor socket list" ↵android-mainline-10.0.0_r9android-mainline-10.0.0_r7android-mainline-10.0.0_r5android-mainline-10.0.0_r4android-10.0.0_r36android-10.0.0_r35android-10.0.0_r34android-10.0.0_r33android-10.0.0_r32android-10.0.0_r31android-10.0.0_r30android10-qpr2-s4-releaseandroid10-qpr2-s3-releaseandroid10-qpr2-s2-releaseandroid10-qpr2-s1-releaseandroid10-qpr2-releaseandroid10-qpr1-mainline-releaseandroid10-mainline-media-releaseTreeHugger Robot
into qt-r1-dev
2019-06-15Snap for 5663715 from 320302d00197eadab68b46448551bb06a7a6d17a to ↵android-build-team Robot
qt-c2f2-release Change-Id: Ifbaabecc9776351a489fd0334eb6487f8b2b030d
2019-06-13Wifi-Hal: Avoid accessing invalid memory while parsing pkt stats am: 320302d001Ajit Vaishya
am: 69687cbf11 Change-Id: I7675243c0a7ef62dc785c2d944ebd50bba46afc5
2019-06-13Wifi-hal: RX and Per packet fate stats for new pkt log version V2 am: 1b30bee315Ajit Vaishya
am: 6ec0ca65d6 Change-Id: I717bcb3f31496ea75812a72e273e4abeb1d98543
2019-06-13Wifi-hal: TX Per Packet stats for V2 version. am: 32886cca7aAjit Vaishya
am: 4cc0f0993c Change-Id: I85ce6153b5bc3a88477d003356d47b411913d2cf
2019-06-13Wifi-Hal: Avoid accessing invalid memory while parsing pkt statsAjit Vaishya
am: 320302d001 Change-Id: I0197c57263b03bfdfcbe20bd094ed68d4d58700b
2019-06-13Wifi-hal: RX and Per packet fate stats for new pkt log version V2Ajit Vaishya
am: 1b30bee315 Change-Id: Ieba7e9b42fa9e5695392263e3e096642bde01e5b
2019-06-13Wifi-hal: TX Per Packet stats for V2 version.Ajit Vaishya
am: 32886cca7a Change-Id: I0c32710c95c4db6c881525e5c7ceb8a26804e33c
2019-06-13Wifi-Hal: Avoid accessing invalid memory while parsing pkt statsAjit Vaishya
Current implementation of packet stats parsing isn't validating remaining buflen, which might lead to accessing invalid memory location while parsing. To address this issue, we need to check whether received buflen is sufficient to parse the stat before reading the stats from nlmsg. While parsing pkt stats, the bufflen shall be decremented for all versions of packet log records. Add logic to decrement buflen for the missed versions also. Change-Id: I573a5158b97f2c2b1b59026a8ae14e23ffc8135f CRs-Fixed: 2422931 Bug: 130226017 Test: Manual Test, turn verbose logging and check pkt log
2019-06-13Wifi-hal: RX and Per packet fate stats for new pkt log version V2Ajit Vaishya
Current RX stats parsing structure differs with the recent architectures. Hence , the firmware / host indicates this need to parse the data with the updated structures through the version ( V2) and the parser is expected to adapt to the same. This commit introduces to parse pktlog stats based on PKT_LOG_V2 parsing structure and the rx rate calculation also differs based on this Version 2. Change-Id: Id0997296e93be15158cb9fd27b25067010227666 CRs-Fixed: 2402099 Bug: 130226017 Test: Manual Test, turn verbose logging and check pkt log
2019-06-13Wifi-hal: TX Per Packet stats for V2 version.Ajit Vaishya
Current TX per packet stats parsing logic cannot be used to parse TX stats for packet log new version V2, because of packet log structure format is different. This changes introduces to parse new packet log version V2, based on required OFFSET from received TX payload. Support to read packet log version i.e V1/V2/V3 by reading firmware version. Change-Id: Ie5c508bb2fd3e00674dd807c3003b00857d3f070 CRs-Fixed: 2402099 Bug: 130226017 Test: Manual Test, turn verbose logging and check pkt log
2019-06-10WIFIHAL: Fix use-after-free issue while freeing monitor socket listVinay Gannevaram
During cleanup of monitor socket list, entries are freed with out being deleted from the list. This results in accessing memory which was already freed. Hence deleting the entry before freeing it, so that list would have only valid entries. Bug: 133773150 Test: Manual Test CRs-Fixed: 2463143 Change-Id: Ic746c7527958f238c77ddd4fd6d98cb8abab67bb Signed-off-by: Vinay Gannevaram <quic_vganneva@quicinc.com>
2019-05-25Snap for 5606075 from dceeae89168333edbda8676581a1820ac3b95a58 to ↵android-build-team Robot
qt-c2f2-release Change-Id: I2d6c012890184a9596e192b3c2dcdec5637dda1f
2019-05-25WIFIHAL: Support to send nl requests through wifihal am: dceeae8916Vinay Gannevaram
am: 863a4106fd Change-Id: I16faa25ac900c582506a876e60e8fe6338e1d070
2019-05-25WIFIHAL: Support to send nl requests through wifihalVinay Gannevaram
am: dceeae8916 Change-Id: I2342c7e3b8508daba646ade3d1adc891a2d016b9
2019-05-23wifi-hal: Map kernel error ENOBUFS to wifi-hal error code am: 5291a58156Rajeev Kumar
am: 5d35f52a99 Change-Id: I14ddd33f091bbeb9cef6b2281857d72853012a05
2019-05-24Merge cherrypicks of [7701782, 7701783, 7701115, 7701940, 7701922, 7701923, ↵android-build-team Robot
7701924, 7701925, 7701926, 7701927, 7701928, 7701929, 7701930, 7701784, 7701785, 7701931, 7701932] into qt-c2f2-release Change-Id: I0ca8381b16028ed28ad6c6069267a6acb3990a92
2019-05-24wifi-hal: Map kernel error ENOBUFS to wifi-hal error codeRajeev Kumar
Kernel error ENOBUFS is not mapped to any defined wifi-hal error code. Map ENOBUFS error to WIFI_ERROR_TOO_MANY_REQUESTS wifi-hal error. Change-Id: I1d372a70a713a25505849da1a6716650007a7f64 CRs-Fixed: 2439902 Bug: 130214647 Bug: 132599519 Test: Regression Test Signed-off-by: Rajeev Kumar <quic_rajekuma@quicinc.com> (cherry picked from commit 5291a581560317dd6b1a1b50edbc7889684957d5)
2019-05-23wifi-hal: Map kernel error ENOBUFS to wifi-hal error codeRajeev Kumar
am: 5291a58156 Change-Id: Ie3cf5e2041d89ba5f62199573e295e028b96f10f
2019-05-23WIFIHAL: Support to send nl requests through wifihalVinay Gannevaram
Added support in wifihal to send nl messages on behalf of its clients. Since netadmin capabilities are given to wifihal, it is used as bridge to send nl messages to kernel Added support for clients to register for nl events. CRs-Fixed: 2424237 Bug: 131618408 Bug: 28340421 Test: Regression test Change-Id: If8b62733e1d298804e0be98918eb875fc52a4ad1 Signed-off-by: Srinivas Girigowda <quic_sgirigow@quicinc.com>
2019-05-23wifi-hal: Map kernel error ENOBUFS to wifi-hal error codeRajeev Kumar
Kernel error ENOBUFS is not mapped to any defined wifi-hal error code. Map ENOBUFS error to WIFI_ERROR_TOO_MANY_REQUESTS wifi-hal error. Change-Id: I1d372a70a713a25505849da1a6716650007a7f64 CRs-Fixed: 2439902 Bug: 130214647 Bug: 132599519 Test: Regression Test Signed-off-by: Rajeev Kumar <quic_rajekuma@quicinc.com>
2019-04-30Merge "Wifi-hal: Enable pktlog when verbose log on." into qt-dev am: bdf118c219lesl
am: 77840f20af Change-Id: I91671eba2e3d106b371705411130144e8ab13d2b
2019-04-30Merge "Wifi-hal: Enable pktlog when verbose log on." into qt-devlesl
am: bdf118c219 Change-Id: I141103a6e1d2b389c07f5dc1c0ed6b5f68194c87
2019-04-30Merge "Wifi-hal: Enable pktlog when verbose log on." into qt-devandroid10-devTreeHugger Robot
2019-04-26Wifi-Hal: Pass the address of the global variable to NL callback am: 35c34d329cAjit Vaishya
am: ac6efd76c2 Change-Id: I4bf5209dbb377fc9a92219661bcd38f3318f1e1e
2019-04-26Wifi-Hal: Pass the address of the global variable to NL callbackAjit Vaishya
am: 35c34d329c Change-Id: If649c1642e47cff632e97ae28d8a1a337a8df4dc
2019-04-25Wifi-hal: Enable pktlog when verbose log on.lesl
In current desgin, packet fate will start logging when log level change to “VERBOSE_DEBUG_PROBLEM”. But in current design, no any use case will change log level to “VERBOSE_DEBUG_PROBLEM”. Framework use “VERBOSE_REPRO_PROBLEM” when user turn on wifi verbose logging in developer option. Modify pkt ring buffer check condition to VERBOSE_DEBUG_PROBLE to enable pktlog with verbose on. Bug:74360031 Test: Manual Test Change-Id: I0d600797108055adafcedd4ac7664b3781c3b74c
2019-04-24Merge "Disable -Wimplicit-fallthrough unless src is fixed." am: 846ffa3252 ↵Chih-Hung Hsieh
am: 80441c10e0 am: 836fac4fcb Change-Id: Ia1af182e83d27b401ff7ecc3be8820aa01d64666
2019-04-24Merge "Disable -Wimplicit-fallthrough unless src is fixed." am: 846ffa3252Chih-Hung Hsieh
am: 80441c10e0 Change-Id: Ie605016d03c4bc53ee1f07117d1b57ccae9795ba
2019-04-24Merge "Disable -Wimplicit-fallthrough unless src is fixed."android-o-mr1-iot-release-1.0.14android-o-mr1-iot-release-1.0.13Chih-Hung Hsieh
am: 846ffa3252 Change-Id: I6dcfe145b30a9ade2ac9ace40a2bb4cb406cdd62
2019-04-24Merge "Disable -Wimplicit-fallthrough unless src is fixed."android-o-mr1-iot-release-1.0.12oreo-mr1-iot-releaseTreehugger Robot
2019-04-24Disable -Wimplicit-fallthrough unless src is fixed.Chih-Hung Hsieh
* Current -Wno-error=implicit-fallthrough caused clang-tidy assertion fault, see https://bugs.llvm.org/show_bug.cgi?id=39312 * We could enable this warning when source file is fixed. Bug: 117780134 Test: build with WITH_TIDY=1 Change-Id: I9b7a6be2556afb70d2a8327053e3b207ef32cef1
2019-04-19Wifi-Hal: Pass the address of the global variable to NL callbackAjit Vaishya
Current implementation passes the address of a local variable to the netlink control block callback, ending up to go out of scope if the callback is invoked after the scope for the current function ends (from where the registration happened), resulting in an invalid memory access. Address this issue by having the respective variable defined with a global scope. Change-Id: Ied10a8f17f20326864f80ac40b0ceac6791f6cd1 CRs-Fixed: 2427930 Bug: 129092516 Test: Manual test
2019-04-03Merge master@5433138 into git_qt-dev-plus-aosp.Bill Rassieur
am: 2a488a9f99 Change-Id: I9f5e718b1cc4430e5f5bdd9a880480680e078267
2019-04-03Merge master@5433138 into git_qt-dev-plus-aosp.Bill Rassieur
Change-Id: I0749829bf3a1273ec7049f0ca4b242cb6b575c1f BUG: 129345239
2019-04-03Merge "SAR: Add handling of WIFI_POWER_SCENARIO_ON_BODY_BT"Ahmed ElArabawy