Randy Pan a47f684020 resolve merge conflicts of 8c79fe5dc4 to master. ...

Change-Id: Id331e763f64ecbf8ed23764a487e32b94c4d3c09

2015-12-29 15:09:09 -08:00

..

p2p

Frameworks/base: Use Arrays.toString

2015-12-14 12:04:26 -08:00

passpoint

…

BatchedScanResult.java

DO NOT MERGE Remove old APIs that are no longer used/implemented

2015-12-10 16:06:50 -08:00

IRttManager.aidl

…

IWifiManager.aidl

DO NOT MERGE Remove old APIs that are no longer used/implemented

2015-12-10 16:06:50 -08:00

IWifiScanner.aidl

…

package.html

Fix @code escapes

2015-12-02 14:24:11 +00:00

RssiPacketCountInfo.java

…

RttManager.aidl

…

RttManager.java

Fail sanity check when BSSID is empty in RTT request

2015-06-05 15:37:51 -07:00

ScanInfo.aidl

DO NOT MERGE Hotspot 2.0 relase 2 first cut.

2015-12-10 16:06:50 -08:00

ScanInfo.java

DO NOT MERGE Hotspot 2.0 relase 2 first cut.

2015-12-10 16:06:50 -08:00

ScanResult.aidl

…

ScanResult.java

DO NOT MERGE Moved Wifi InformationElement parsing to a common utility class

2015-12-10 16:06:50 -08:00

ScanSettings.aidl

…

ScanSettings.java

…

SupplicantState.java

…

WifiActivityEnergyInfo.aidl

…

WifiActivityEnergyInfo.java

Bluetooth energy: fix overflow in calculation

2015-06-15 17:19:07 -07:00

WifiChannel.java

…

WifiConfiguration.aidl

…

WifiConfiguration.java

Merge "correctly print wificonfiguration creation and update time" into mnc-dev

2015-07-01 20:06:29 +00:00

WifiConnectionStatistics.aidl

…

WifiConnectionStatistics.java

…

WifiEnterpriseConfig.aidl

…

WifiEnterpriseConfig.java

WifiEnterpriseConfiguration: Do not print credentials in toString

2015-11-13 16:43:53 -08:00

WifiInfo.aidl

…

WifiInfo.java

Add DO API to get wifi mac address

2015-11-24 15:38:16 -08:00

WifiLinkLayerStats.java

…

WifiManager.java

DO NOT MERGE Remove old APIs that are no longer used/implemented

2015-12-10 16:06:50 -08:00

WifiNetworkConnectionStatistics.aidl

…

WifiNetworkConnectionStatistics.java

…

WifiScanner.java

Correct WiFi exponential back off scan

2015-12-29 11:28:43 -08:00

WifiSsid.java

…

WpsInfo.aidl

…

WpsInfo.java

…

WpsResult.aidl

…

WpsResult.java

…