summaryrefslogtreecommitdiffstats
path: root/wifi/java/android
Commit message (Expand)AuthorAgeFilesLines
* am dfb82a24: am 35967d04: Merge "make wifi cellular params configurable" into...vandwalle2014-09-141-3/+6
|\
| * make wifi cellular params configurablevandwalle2014-09-131-3/+6
* | am 8c8f56ca: am e62a18e5: Merge "various fixes:" into lmp-devvandwalle2014-09-131-25/+85
|\ \ | |/
| * various fixes:vandwalle2014-09-121-25/+85
* | am a5ef501a: am 9e444d7a: Merge "make autojoin configurable, clean up BSSID i...vandwalle2014-09-101-8/+16
|\ \ | |/
| * make autojoin configurable, clean up BSSID info that may be stake in WifiConf...vandwalle2014-09-101-8/+16
* | am b73e94b4: am 8270c789: Merge "Secure access to WifiScanner" into lmp-devVinit Deshpande2014-09-101-0/+2
|\ \ | |/
| * Merge "Secure access to WifiScanner" into lmp-devVinit Deshpande2014-09-101-0/+2
| |\
| | * Secure access to WifiScannerVinit Deshpande2014-09-081-0/+2
* | | am 33e1b95c: am fc591cc1: Merge "Implement getAvailableChannels" into lmp-devVinit Deshpande2014-09-092-1/+13
|\ \ \ | |/ /
| * | Merge "Implement getAvailableChannels" into lmp-devVinit Deshpande2014-09-092-1/+13
| |\ \
| | * | Implement getAvailableChannelsVinit Deshpande2014-09-052-1/+13
| | |/
* | | am 344ddea4: am a35a795f: Merge "add more info to WifiConfiguration.toString:...vandwalle2014-09-081-7/+109
|\ \ \ | |/ /
| * | add more info to WifiConfiguration.toString:vandwalle2014-09-071-7/+109
| |/
* | am d3a78eff: am 36b0eac4: Merge "Add @SystemApi annotations to methods used b...David Christie2014-09-041-0/+3
|\ \ | |/
| * Merge "Add @SystemApi annotations to methods used by GmsCore. -Currently thes...David Christie2014-09-041-0/+3
| |\
| | * Add @SystemApi annotations to methods used by GmsCore.David Christie2014-09-041-0/+3
* | | am f4b970e5: am 2705b859: Merge "Address API Council feedback for WifiAdapter...Vinit Deshpande2014-09-034-309/+211
|\ \ \ | |/ /
| * | Address API Council feedback for WifiAdapter/WPS APIsVinit Deshpande2014-08-294-309/+211
* | | am f7c9ffc3: am 4c5d4e29: Merge "fix ScanResult read from parcel, this functi...vandwalle2014-08-271-0/+1
|\ \ \ | |/ /
| * | fix ScanResult read from parcel, this function was broken and causes wifi set...vandwalle2014-08-271-0/+1
* | | am 39b53f3c: am bdc65df3: Merge "remove passpoint - DO NOT MERGE" into lmp-devvandwalle2014-08-2613-3710/+0
|\ \ \ | |/ /
| * | Merge "remove passpoint - DO NOT MERGE" into lmp-devvandwalle2014-08-2613-3710/+0
| |\ \
| | * | remove passpoint - DO NOT MERGEvandwalle2014-08-2613-3710/+0
* | | | am dbf54ec2: am b2139607: Merge "add radio stats to link layer" into lmp-devvandwalle2014-08-267-3/+235
|\ \ \ \ | |/ / /
| * | | add radio stats to link layervandwalle2014-08-267-3/+235
| |/ /
* | | am f654d5b2: am 2954d35a: Merge "Revert "Annotate @SystemApi on some WifiMana...Wenchao Tong2014-08-211-5/+0
|\ \ \ | |/ /
| * | Merge "Revert "Annotate @SystemApi on some WifiManager methods."" into lmp-devWenchao Tong2014-08-211-5/+0
| |\ \
| | * | Revert "Annotate @SystemApi on some WifiManager methods."Wenchao Tong2014-08-201-5/+0
* | | | am 01c23ffb: am 23e25851: Merge "per bssid blacklist" into lmp-devvandwalle2014-08-211-6/+23
|\ \ \ \ | |/ / /
| * | | Merge "per bssid blacklist" into lmp-devvandwalle2014-08-211-6/+23
| |\ \ \ | | |_|/ | |/| |
| | * | per bssid blacklistvandwalle2014-08-201-6/+23
* | | | am 5e3130d6: am fa141926: Merge "Improve documentation of ScanResult and Wifi...Jeff Davidson2014-08-212-3/+10
|\ \ \ \ | |/ / /
| * | | Merge "Improve documentation of ScanResult and WifiInfo." into lmp-devJeff Davidson2014-08-202-3/+10
| |\ \ \ | | |/ / | |/| |
| | * | Improve documentation of ScanResult and WifiInfo.Jeff Davidson2014-08-122-3/+10
* | | | am 3a7bbbff: am 14aa17a2: Merge "remove passpoint, except ANQP - DO NOT MERGE...vandwalle2014-08-201-10/+0
|\ \ \ \ | |/ / /
| * | | Merge "remove passpoint, except ANQP - DO NOT MERGE" into lmp-devvandwalle2014-08-201-10/+0
| |\ \ \
| | * | | remove passpoint, except ANQP - DO NOT MERGEvandwalle2014-08-191-10/+0
| | |/ /
* | | | am 3e76a3aa: am 3ddfe1ce: Merge "Annotate @SystemApi on some WifiManager meth...Wenchao Tong2014-08-201-0/+5
|\ \ \ \ | |/ / /
| * | | Merge "Annotate @SystemApi on some WifiManager methods." into lmp-devWenchao Tong2014-08-191-0/+5
| |\ \ \ | | | |/ | | |/|
| | * | Annotate @SystemApi on some WifiManager methods.Wenchao Tong2014-08-191-0/+5
* | | | am 45b565ff: am 14152c79: Merge "Stop using LinkProperties for static configu...Lorenzo Colitti2014-08-191-6/+16
|\ \ \ \ | |/ / /
| * | | Stop using LinkProperties for static configuration.Lorenzo Colitti2014-08-191-6/+16
| |/ /
* | | am 400ec1b9: am 085889e3: Merge "WifiP2pWfdInfo set device type bugfix"Elliott Hughes2014-08-181-0/+1
|\ \ \ | |/ / |/| |
| * | am 085889e3: Merge "WifiP2pWfdInfo set device type bugfix"Elliott Hughes2014-08-181-0/+1
| |\ \
| | * | WifiP2pWfdInfo set device type bugfixGrigoriy Kraynov2014-08-181-0/+1
| | * | DO NOT MERGE refactor wifi p2p's startDhcpServer functionJianzheng Zhou2014-06-231-5/+23
| |/ /
| * | am bf056846: am 058061da: Merge "Fix stopBatchedScan not working for wifi" in...Wei Wang2014-03-211-1/+5
| |\ \
| | * \ Merge "Fix stopBatchedScan not working for wifi" into klp-devWei Wang2014-03-211-1/+5
| | |\ \
| | | * | Fix stopBatchedScan not working for wifiWei Wang2014-03-201-1/+5