summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "Snap for 6844436 from 7bddc5a99826911a74a0ceef4112813ae5b0217c to simp...simpleperf-releaseandroid-build-prod (mdb)2020-09-178-55/+3319
|\
| * Snap for 6844436 from 7bddc5a99826911a74a0ceef4112813ae5b0217c to simpleperf-...android-build-prod (mdb)2020-09-178-55/+3319
|/|
| * Merge "Merge Android R"HEADmasterXin Li2020-09-108-55/+3319
| |\
| | * Merge Android RXin Li2020-09-088-55/+3319
| |/|
| | * Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)Xin Li2020-08-278-55/+3319
| |/|
| | * [automerger skipped] Merge "Merge QQ3A.200605.002 into master" am: 64500046a9...Xin Li2020-06-080-0/+0
| | |\ | | |/ | |/|
| | * Merge "fix -Wunreachable-code-loop-increment" am: 33fe26ead4 am: 650e783d44George Burgess IV2020-05-131-260/+175
| | |\
| | * \ Merge "Add METADATA to wlan: BSD+Apache2=NOTICE" am: c9a5eca216 am: b6cb1bdc08Treehugger Robot2020-05-041-0/+3
| | |\ \
| | * \ \ WifiHAl:Create separate create/delete virtual iface functions am: 5780336dd2Khanjan Desai2020-04-203-0/+130
| | |\ \ \
| | | * | | WifiHAl:Create separate create/delete virtual iface functionsandroid11-devKhanjan Desai2020-04-173-0/+130
| | * | | | Wifi-Hal: Add NAN iface type in dynamic creation of iface am: fe97994539Swarn Singh2020-04-181-1/+2
| | |\| | |
| | | * | | Wifi-Hal: Add NAN iface type in dynamic creation of ifaceSwarn Singh2020-04-171-1/+2
| | * | | | [automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into st...Xin Li2020-04-100-0/+0
| | |\ \ \ \
| | * \ \ \ \ WiFi-HAL: get base wlan interface index from global handle am: 24c9cf0854Veerendranath Jakkam2020-03-201-4/+10
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | |
| | | * | | | WiFi-HAL: get base wlan interface index from global handleVeerendranath Jakkam2020-03-171-4/+10
| | * | | | | [automerger skipped] DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp@6304901 into ...Xin Li2020-03-200-0/+0
| | |\ \ \ \ \
| | * \ \ \ \ \ WiFi-HAL: Add support to configure thermal level am: fc600dab60Automerger Merge Worker2020-03-162-0/+100
| | |\ \ \ \ \ \ | | | | |/ / / / | | | |/| | | |
| | | * | | | | WiFi-HAL: Add support to configure thermal levelVamsi Krishna2020-03-152-0/+100
| | * | | | | | WiFi-HAL: Update qca-vendor_copy.h with latest as on 3/2/2020 am: c9439afa0eAutomerger Merge Worker2020-03-164-47/+3073
| | |\| | | | |
| | | * | | | | WiFi-HAL: Update qca-vendor_copy.h with latest as on 3/2/2020Vamsi Krishna2020-03-154-47/+3073
| | * | | | | | WifiHal: Fix OOB read of ctrl buf while registering monitor sock am: 117593cf...Automerger Merge Worker2020-03-101-8/+25
| | |\| | | | |
| | | * | | | | WifiHal: Fix OOB read of ctrl buf while registering monitor sock am: 117593cf89Automerger Merge Worker2020-03-101-8/+25
| | | |\ \ \ \ \
| | * | | | | | | qcwcn: Heap-buffer-overflow in register_monitor_sock() of wifi hal am: 0ed8db...Automerger Merge Worker2020-03-101-0/+6
| | |\| | | | | |
| | | * | | | | | qcwcn: Heap-buffer-overflow in register_monitor_sock() of wifi hal am: 0ed8db...Automerger Merge Worker2020-03-101-0/+6
| | | |\ \ \ \ \ \
| | * | | | | | | | Heap-buffer-overflow in send_nl_data() of wifi hal am: 0a1b211537 am: 959e96762cAutomerger Merge Worker2020-03-101-0/+6
| | |\| | | | | | |
| | | * | | | | | | Heap-buffer-overflow in send_nl_data() of wifi hal am: 0a1b211537Automerger Merge Worker2020-03-101-0/+6
| | |/| | | | | | |
| | * | | | | | | | Merge "Stop using LOCAL_COPY_HEADERS" am: f526767014 am: db4bd17858 am: 9ea32...Automerger Merge Worker2020-01-282-6/+1
| | |\ \ \ \ \ \ \ \
| | * | | | | | | | | Wifi: Modify log specifiers for 64bit hex numbersAhmed ElArabawy2019-11-153-6/+6
| | * | | | | | | | | feature_set change from 'int' to 'long'Ahmed ElArabawy2019-11-133-6/+6
| | * | | | | | | | | [automerger skipped] DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915...Xin Li2019-10-300-0/+0
| | |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ [automerger skipped] Merge Coral/Flame into AOSP master am: 2dd444c395 -s our...Xin Li2019-10-260-0/+0
| | |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ Skip QD1A.190821.011 in stage-aosp-master am: e66c67c549 am: 39112a4558Xin Li2019-10-180-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Wifi-Hal: Clear received pointer on completion of Nan handle EventAjit Vaishya2019-10-022-1/+2
| | * | | | | | | | | | | | [automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into ...Xin Li2019-09-110-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ [automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master" am: ...Xin Li2019-09-050-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ [automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (56...Xin Li2019-07-020-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "WIFIHAL: Fix use-after-free issue while freeing monitor socket list" i...Vinay Gannevaram2019-06-262-2/+13
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Wifi-Hal: Avoid accessing invalid memory while parsing pkt stats am: 320302d001Ajit Vaishya2019-06-132-27/+37
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Wifi-hal: RX and Per packet fate stats for new pkt log version V2 am: 1b30bee315Ajit Vaishya2019-06-131-1/+21
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Wifi-hal: TX Per Packet stats for V2 version. am: 32886cca7aAjit Vaishya2019-06-131-25/+5
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ WIFIHAL: Support to send nl requests through wifihal am: dceeae8916Vinay Gannevaram2019-05-2510-8/+1293
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ wifi-hal: Map kernel error ENOBUFS to wifi-hal error code am: 5291a58156Rajeev Kumar2019-05-231-0/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Wifi-hal: Enable pktlog when verbose log on." into qt-dev am: bdf118c219lesl2019-04-301-2/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Wifi-Hal: Pass the address of the global variable to NL callback am: 35c34d329cAjit Vaishya2019-04-262-5/+5
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Disable -Wimplicit-fallthrough unless src is fixed." am: 846ffa3252 am...Chih-Hung Hsieh2019-04-241-2/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge master@5433138 into git_qt-dev-plus-aosp.Bill Rassieur2019-04-030-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge master@5433138 into git_qt-dev-plus-aosp.Bill Rassieur2019-04-037-13/+716
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Snap for 6792789 from cc730ec4a14668ce480cd91d75b1e769967a4156 to simp...android-build-prod (mdb)2020-08-260-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | Snap for 6792789 from cc730ec4a14668ce480cd91d75b1e769967a4156 to simpleperf-...android-build-prod (mdb)2020-08-260-0/+0
|/| | | | | | | | | | | | | | | | | | | | | | | | | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | | | | | | [automerger skipped] Merge "Merge QQ3A.200605.002 into master" am: 64500046a9...Xin Li2020-06-080-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | |