summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "Merge Android R"HEADmasterXin Li2020-09-1012-122/+6483
|\
| * Merge Android RXin Li2020-09-0812-122/+6483
|/|
| * Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)Xin Li2020-08-2712-122/+6483
|/|
| * Wifi: Support of channel stats in HAL V1.3 am: 661f0af7afWinnie Chen2020-06-241-15/+0
| |\
| | * Wifi: Support of channel stats in HAL V1.3android11-devWinnie Chen2020-06-241-15/+0
| * | Wifi: Enable SAR function am: 0e6c01517axinrui2020-06-121-0/+2
| |\|
| | * Wifi: Enable SAR functionxinrui2020-06-041-0/+2
| * | Wifi: Add get wake up reason stats am: 947c783201Terry Chen2020-05-293-1/+174
| |\|
| | * Wifi: Add get wake up reason statsTerry Chen2020-05-283-1/+174
| * | WifiHAl: Add error alert support am: d45dd2c7bdXi Zhang2020-05-291-4/+26
| |\|
| | * WifiHAl: Add error alert supportXi Zhang2020-05-281-4/+26
| * | Wifi: Increase socket buffer size of event_sock/cmd_socket am: 0c9db076cbterry-ht.chen2020-05-291-0/+15
| |\|
| | * Wifi: Increase socket buffer size of event_sock/cmd_socketterry-ht.chen2020-05-281-0/+15
| * | Merge "Add METADATA to wlan: Apache2+ISC+BSD=NOTICE" am: 2c3986c38d am: ef6b2...Treehugger Robot2020-05-051-0/+3
| |\ \ | |/ / |/| |
* | | Merge "Add METADATA to wlan: Apache2+ISC+BSD=NOTICE" am: 2c3986c38dandroid-r-beta-3android-r-beta-2Treehugger Robot2020-05-051-0/+3
|\ \ \
| * | | Merge "Add METADATA to wlan: Apache2+ISC+BSD=NOTICE"Treehugger Robot2020-05-051-0/+3
|/| | |
| * | | Add METADATA to wlan: Apache2+ISC+BSD=NOTICEBob Badour2020-05-011-0/+3
|/ / /
| * | WifiHAl: Fix VtsHalWifiNanV1_2TargetTest test fails am: a5e9eed671Xi Zhang2020-05-011-0/+13
| |\|
| | * WifiHAl: Fix VtsHalWifiNanV1_2TargetTest test failsXi Zhang2020-05-011-0/+13
| * | Wifi: Retrieved debug log am: 0a0cde39b2Terry Chen2020-05-011-2/+7
| |\|
| | * Wifi: Retrieved debug logTerry Chen2020-05-011-2/+7
| * | Wifi: Set event socket pid to brcm driver am: b739e60e12Terry Chen2020-05-011-3/+38
| |\|
| | * Wifi: Set event socket pid to brcm driverTerry Chen2020-05-011-3/+38
| * | Wifi: NAN Support in HAL am: 4594691db7Terry Chen2020-05-019-83/+5986
| |\|
| | * Wifi: NAN Support in HALTerry Chen2020-04-309-83/+5986
| * | Add Support Set Roaming State am: 98a8aa1cb4sanfran2020-04-293-0/+65
| |\|
| | * Add Support Set Roaming Statesanfran2020-04-293-0/+65
| * | Wifi: Consider ethertype in KeepAlive packet offloading am: 26c49a560fTerry Chen2020-04-292-8/+25
| |\|
| | * Wifi: Consider ethertype in KeepAlive packet offloadingTerry Chen2020-04-292-8/+25
| * | Add Support Wi-Fi Configure Roaming am: 60388f580fsanfran2020-04-293-1/+114
| |\|
| | * Add Support Wi-Fi Configure Roamingsanfran2020-04-293-1/+114
| * | Add Support Getting Roaming Capabilities am: e3cd0a1f42sanfran2020-04-293-13/+26
| |\|
| | * Add Support Getting Roaming Capabilitiessanfran2020-04-293-13/+26
| |/
| * [automerger skipped] DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915...Xin Li2019-10-300-0/+0
| |\ | |/ |/|
* | DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-m...android-r-preview-4android-r-preview-3android-r-preview-2Xin Li2019-10-300-0/+0
|\ \
| * \ DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-m...android-r-preview-1Xin Li2019-10-300-0/+0
| |\ \ | |/ / |/| |
| | * [automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into ...Xin Li2019-09-080-0/+0
| | |\ | |_|/ |/| |
* | | [automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into ...Xin Li2019-09-080-0/+0
|\ \ \
| * | | [automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into ...Xin Li2019-09-080-0/+0
| |\| |
| | * | Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-masterXin Li2019-09-080-0/+0
| | |\ \
| | | | * [automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master" am: ...Xin Li2019-09-050-0/+0
| | | | |\ | |_|_|_|/ |/| | | |
* | | | | [automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master" am: ...Xin Li2019-09-050-0/+0
|\| | | | | |_|/ / |/| | |
| * | | [automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master" am: ...Xin Li2019-09-050-0/+0
|/| | |
| * | | [automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master"Xin Li2019-09-050-0/+0
| |\| |
| | * | Merge "DO NOT MERGE - Merge Android 10 into master"ndk-sysroot-r21Xin Li2019-09-056-2/+7
| | |\ \
| | | * | DO NOT MERGE - Merge Android 10 into masterXin Li2019-09-046-2/+7
| | |/| | | | |/ / | |/| |
| | | * [automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (56...Xin Li2019-07-020-0/+0
| | | |\ | |_|_|/ |/| | |
* | | | DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aos...Xin Li2019-07-020-0/+0
|\| | |
| * | | DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aos...Xin Li2019-07-016-2/+7
| |\ \ \
| | | | * [automerger skipped] Merge "Remove LOCAL_MODULE_TAGS := debug" am: ffc847abb0...Dan Willemsen2019-06-190-0/+0
| | | | |\ | |_|_|_|/ |/| | | |