Mike Lockwood 0561030490 Fix broken merge of "handle bssid blacklist in case of dhcp failures" ...

Change-Id: Iba13db478ed69976c37bd4882f59bf0cae2212e6

Conflicts:
	wifi/java/android/net/wifi/ScanResult.java

2014-09-24 14:27:06 -07:00

..

p2p

am 400ec1b9: am 085889e3: Merge "WifiP2pWfdInfo set device type bugfix"

2014-08-18 19:48:26 +00:00

passpoint

remove passpoint - DO NOT MERGE

2014-08-26 14:56:04 +00:00

BatchedScanResult.aidl

…

BatchedScanResult.java

…

BatchedScanSettings.aidl

…

BatchedScanSettings.java

…

IRttManager.aidl

…

IWifiManager.aidl

Address API Council feedback for WifiAdapter/WPS APIs

2014-08-29 13:36:51 -07:00

IWifiScanner.aidl

Implement getAvailableChannels

2014-09-05 20:43:57 -07:00

package.html

…

RssiPacketCountInfo.java

…

RttManager.java

…

ScanResult.aidl

…

ScanResult.java

Fix broken merge of "handle bssid blacklist in case of dhcp failures"

2014-09-24 14:27:06 -07:00

ScanSettings.aidl

…

ScanSettings.java

…

SupplicantState.java

…

WifiActivityEnergyInfo.aidl

add radio stats to link layer

2014-08-26 00:28:42 +00:00

WifiActivityEnergyInfo.java

add radio stats to link layer

2014-08-26 00:28:42 +00:00

WifiChannel.aidl

…

WifiChannel.java

…

WifiConfiguration.aidl

…

WifiConfiguration.java

Fix broken merge of "handle bssid blacklist in case of dhcp failures"

2014-09-24 14:27:06 -07:00

WifiConnectionStatistics.aidl

…

WifiConnectionStatistics.java

…

WifiEnterpriseConfig.aidl

…

WifiEnterpriseConfig.java

Allow creating EAP_TLS network without specifying Phase2.None

2014-09-13 11:10:07 -07:00

WifiInfo.aidl

…

WifiInfo.java

…

WifiLinkLayerStats.java

add radio stats to link layer

2014-08-26 00:28:42 +00:00

WifiManager.java

am 1fc17b58: am d3a78eff: am 36b0eac4: Merge "Add @SystemApi annotations to methods used by GmsCore. -Currently these methods are called using reflection for location. Bug: 17371392 Change-Id: I6546f5b485415beff69164ba0d526757ee831f69" into lmp-dev

2014-09-04 21:29:00 +00:00

WifiNetworkConnectionStatistics.aidl

…

WifiNetworkConnectionStatistics.java

…

WifiScanner.java

Merge "Secure access to WifiScanner" into lmp-dev

2014-09-10 06:34:25 +00:00

WifiSsid.java

…

WpsInfo.aidl

…

WpsInfo.java

…

WpsResult.aidl

…

WpsResult.java

…