Etan Cohen 36711e0e2c Merge changes from topic 'mwd-merge-040115' ...

* changes:
  Merge (manually) pag/209446: Increase allowed duration to connect to HOGP profile
  Merge commit 'd91f193' into merge2
  Merge commit '5718646' into merge2
  Merge commit '7aa0345' into merge2

2015-04-02 03:08:02 +00:00

..

p2p

Frameworks/base: Fix a hashCode implementation

2015-03-15 14:38:59 -07:00

passpoint

Merge remote-tracking branch 'goog/mirror-m-wireless-internal-release' into master_merge

2015-03-24 13:46:08 -07:00

BatchedScanResult.aidl

…

BatchedScanResult.java

…

BatchedScanSettings.aidl

…

BatchedScanSettings.java

…

IRttManager.aidl

Change rtt Framework interface

2015-03-18 22:26:48 +00:00

IWifiManager.aidl

Merge "export API to disable autojoin scan initial implementation" into lmp-mr1-wfc-dev

2015-03-19 02:58:01 +00:00

IWifiScanner.aidl

…

package.html

…

RssiPacketCountInfo.java

…

RttManager.aidl

Change rtt Framework interface

2015-03-18 22:26:48 +00:00

RttManager.java

Change rtt Framework interface

2015-03-18 22:26:48 +00:00

ScanResult.aidl

…

ScanResult.java

Fix scan results to hold passpoint data

2015-03-17 17:11:06 -07:00

ScanSettings.aidl

…

ScanSettings.java

…

SupplicantState.java

…

WifiActivityEnergyInfo.aidl

…

WifiActivityEnergyInfo.java

Merge commit 'd91f193' into merge2

2015-04-01 09:31:43 -07:00

WifiChannel.aidl

…

WifiChannel.java

…

WifiConfiguration.aidl

…

WifiConfiguration.java

Merge remote-tracking branch 'goog/mirror-m-wireless-internal-release' into master_merge

2015-03-24 13:46:08 -07:00

WifiConnectionStatistics.aidl

…

WifiConnectionStatistics.java

…

WifiEnterpriseConfig.aidl

…

WifiEnterpriseConfig.java

EAP-AKA' : Add support of EAP-AKA' in WiFi Enterprise methods

2015-03-25 15:38:28 -07:00

WifiInfo.aidl

…

WifiInfo.java

…

WifiLinkLayerStats.java

Remove unused imports in frameworks/base.

2015-02-28 14:47:49 -05:00

WifiManager.java

Merge changes from topic 'mwd-merge-040115'

2015-04-02 03:08:02 +00:00

WifiNetworkConnectionStatistics.aidl

…

WifiNetworkConnectionStatistics.java

Remove unused imports in frameworks/base.

2015-02-28 14:47:49 -05:00

WifiScanner.java

Few changes to make API check happy [DO NOT MERGE]

2015-03-09 19:02:09 -07:00

WifiSsid.java

…

WpsInfo.aidl

…

WpsInfo.java

…

WpsResult.aidl

…

WpsResult.java

…