summaryrefslogtreecommitdiffstats
path: root/wifi
Commit message (Expand)AuthorAgeFilesLines
* Merge changes from topic 'mwd-merge-040115'Etan Cohen2015-04-023-2/+14
|\
| * Merge commit 'd91f193' into merge2Etan Cohen2015-04-013-2/+14
| |\
| | * EAP-AKA' : Add support of EAP-AKA' in WiFi Enterprise methodsJean-Michel Bachot2015-03-251-1/+4
| | * add wifi config for power calculationPierre Vandwalle2015-03-242-1/+10
* | | Move reset network settings into framework.Stuart Scott2015-03-301-0/+21
|/ /
* | Retrieve WiFi info outside of BatteryStatsImplAdam Lesinski2015-03-261-6/+29
* | Merge remote-tracking branch 'goog/mirror-m-wireless-internal-release' into m...Prerepa Viswanadham2015-03-248-72/+587
|\ \ | |/
| * Merge "More fixes to get passpoint working" into m-wireless-devJan Nordqvist2015-03-191-2/+1
| |\
| | * More fixes to get passpoint workingVinit Deshpande2015-03-181-2/+1
| * | Merge "export API to disable autojoin scan initial implementation" into lmp-m...Pierre Vandwalle2015-03-192-0/+25
| |\ \ | | |/ | |/|
| | * export API to disable autojoin scan initial implementationPierre Vandwalle2015-03-132-0/+25
| * | Change rtt Framework interfacexinhe2015-03-183-50/+516
| * | Fix scan results to hold passpoint dataVinit Deshpande2015-03-173-18/+38
| * | Improve passpoint configuration validationVinit Deshpande2015-03-161-4/+9
| * | Few changes to make API check happy [DO NOT MERGE]Vinit Deshpande2015-03-091-3/+8
| * | am "add 2 side RTT support on scan"Vinit Deshpande2015-03-092-4/+92
| |\ \
| * \ \ am "Passpoint API - Take 1"Vinit Deshpande2015-03-092-25/+110
| |\ \ \
| * \ \ \ am "Do not provide 5GHz option for softap if there is no country code available"Vinit Deshpande2015-03-092-0/+17
| |\ \ \ \
| * \ \ \ \ am "Introduce onLost event on bssid hotlist [DO NOT MERGE]"Vinit Deshpande2015-03-091-0/+8
| |\ \ \ \ \
| * \ \ \ \ \ am "get channel list from driver for SoftAP channel selection"Vinit Deshpande2015-03-091-14/+0
| |\ \ \ \ \ \
| * \ \ \ \ \ \ am "Revert "Initial Passpoint code.""Vinit Deshpande2015-03-0941-3433/+0
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ am "Initial Passpoint code."Vinit Deshpande2015-03-0941-0/+3433
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ am "set softAP on a specified band, including both 2.4 and 5 GHz band"Vinit Deshpande2015-03-091-0/+41
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ am "Bring in passpoint code [DO NOT MERGE]"Vinit Deshpande2015-03-0913-0/+3868
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ am "New Additions to WifiScanner APIs [DO NOT MERGE]"Vinit Deshpande2015-03-091-9/+185
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | |
* | | | | | | | | | | | am 7cff91ea: am 079cfa64: Merge "Frameworks/base: Fix a hashCode implementation"Robert Greenwalt2015-03-161-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Frameworks/base: Fix a hashCode implementationAndreas Gampe2015-03-151-1/+1
* | | | | | | | | | | | | am "add 2 side RTT support on scan"Vinit Deshpande2015-03-152-4/+92
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | |
| * | | | | | | | | | | | add 2 side RTT support on scanxinhe2015-03-042-4/+92
| * | | | | | | | | | | | Merge "Do not provide 5GHz option for softap if there is no country code avai...xinhe2015-02-252-0/+17
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | |
| * | | | | | | | | | | | Merge "Passpoint API - Take 1" into m-wireless-wifi-devVinit Deshpande2015-02-252-25/+110
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | / | | | |_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | |
| * | | | | | | | | | | Introduce onLost event on bssid hotlist [DO NOT MERGE]Vinit Deshpande2015-02-201-0/+8
| | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |
* | | | | | | | | | | am "Passpoint API - Take 1"Vinit Deshpande2015-03-152-24/+110
|\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Passpoint API - Take 1Vinit Deshpande2015-02-242-25/+110
| |/ / / / / / / / /
* | | | | | | | | | am "Do not provide 5GHz option for softap if there is no country code available"Vinit Deshpande2015-03-152-0/+17
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| * | | | | | | | | Do not provide 5GHz option for softap if there is no country code availablexinhe2015-02-232-0/+17
| |/ / / / / / / /
* | | | | | | | | am "get channel list from driver for SoftAP channel selection"Vinit Deshpande2015-03-151-14/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | get channel list from driver for SoftAP channel selectionxinhe2015-02-041-14/+0
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | am "Revert "Initial Passpoint code.""Vinit Deshpande2015-03-1541-3433/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Revert "Initial Passpoint code."Vinit Deshpande2015-02-0441-3433/+0
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | am "Initial Passpoint code."Vinit Deshpande2015-03-1541-0/+3433
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Initial Passpoint code.Jan Nordqvist2015-01-3041-0/+3433
| * | | | | | Merge "set softAP on a specified band, including both 2.4 and 5 GHz band" int...xinhe2015-01-161-0/+41
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | / | | | |_|_|/ | | |/| | |
| * | | | | Bring in passpoint code [DO NOT MERGE]Vinit Deshpande2015-01-1213-0/+3868
| | |_|_|/ | |/| | |
| * | | | New Additions to WifiScanner APIs [DO NOT MERGE]Vinit Deshpande2015-01-121-9/+185
* | | | | am "set softAP on a specified band, including both 2.4 and 5 GHz band"Vinit Deshpande2015-03-151-0/+43
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | set softAP on a specified band, including both 2.4 and 5 GHz bandxinhe2015-01-161-0/+41
| |/ / /
* | | | Change WiFi and Bluetooth ActivityEnergyInfo classesAdam Lesinski2015-03-091-10/+12
* | | | Remove unused imports in frameworks/base.John Spurlock2015-02-286-17/+0
* | | | Merge "aggressively blacklist WifiConfiguration for the purpose of switching ...vandwalle2015-01-291-0/+46
|\ \ \ \ | | |/ / | |/| |