Primiano Tucci 0f422c6d80 resolved conflicts for merge of 28495b02 into master ...

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

Change-Id: I86a4537d603cbf325e5e0bff715a442d9dc6b6db

2014-10-08 12:22:29 +01: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

Remove unused imports from frameworks/base.

2013-11-20 11:31:47 -05:00

BatchedScanSettings.aidl

…

BatchedScanSettings.java

Use correct wifi batching parameter ranges.

2014-04-01 22:51:52 +00:00

IRttManager.aidl

Introduce RTT Manager

2014-07-17 00:45:20 +00:00

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

remember and report network score

2014-06-09 14:50:47 -07:00

RttManager.java

Enable RTT End-to-end

2014-07-28 09:00:10 -07:00

ScanResult.aidl

…

ScanResult.java

resolved conflicts for merge of 28495b02 into master

2014-10-08 12:22:29 +01:00

ScanSettings.aidl

Add new API to scan a given channel set

2014-02-18 15:26:29 -08:00

ScanSettings.java

Add new API to scan a given channel set

2014-02-18 15:26:29 -08:00

SupplicantState.java

Move Wifi/P2p service components under services

2013-12-11 16:06:49 -08:00

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

Add new API to scan a given channel set

2014-02-18 15:26:29 -08:00

WifiChannel.java

Add new API to scan a given channel set

2014-02-18 15:26:29 -08:00

WifiConfiguration.aidl

…

WifiConfiguration.java

resolved conflicts for merge of 28495b02 into master

2014-10-08 12:22:29 +01:00

WifiConnectionStatistics.aidl

introduce WifiConnectionstatistics

2014-07-28 21:20:55 +00:00

WifiConnectionStatistics.java

record join attempts

2014-07-29 12:33:12 -07:00

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

adding debug information to bug report for Bug:16751877

2014-10-07 14:38:38 -07:00

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

introduce WifiConnectionstatistics

2014-07-28 21:20:55 +00:00

WifiNetworkConnectionStatistics.java

introduce WifiConnectionstatistics

2014-07-28 21:20:55 +00:00

WifiScanner.java

Merge "Secure access to WifiScanner" into lmp-dev

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

WifiSsid.java

…

WpsInfo.aidl

…

WpsInfo.java

Make Wifi WPS API available on application layer

2014-05-20 22:26:19 -07:00

WpsResult.aidl

…

WpsResult.java

…