Robert Greenwalt a8e0dfae06 resolved conflicts for merge of db46fa25 to master ...

Change-Id: I8df9d5d07588fbd70e417dae567be26f645b74b6

2011-05-02 14:41:57 -07:00

..

IWifiManager.aidl

Backup and restore IP and proxy settings

2011-03-10 16:57:10 -08:00

NetworkUpdateResult.java

Fix configuration change handling

2010-12-03 14:15:39 -08:00

package.html

…

ScanResult.aidl

…

ScanResult.java

…

SupplicantState.java

fix network disconnection handling

2011-03-02 14:45:42 -08:00

SupplicantStateTracker.java

Rename HierarchicalStateMachine and HierarchicalState to StateMachine and State.

2011-04-18 14:55:10 -07:00

WifiConfigStore.java

Add RouteInfo objects for tracking routes.

2011-05-02 11:17:30 -07:00

WifiConfiguration.aidl

…

WifiConfiguration.java

Add WPA support for soft Ap

2011-02-17 11:28:15 -08:00

WifiInfo.aidl

…

WifiInfo.java

Make WifiInfo not use int for ip address.

2011-02-16 17:31:11 -08:00

WifiManager.java

Update WakeLock-related docs to mention permissions

2011-03-16 09:38:11 -07:00

WifiMonitor.java

Remove the deprecated things from Config.java. These haven't been working since before 1.0.

2011-04-07 19:23:05 -07:00

WifiNative.java

Add support for supplicant SCAN_INTERVAL

2011-04-06 09:11:15 -07:00

WifiStateMachine.java

am d369d64e: am 8ab6a6d4: Merge "Add DhcpStateMachine for interation with dhcpcd" into honeycomb-LTE

2011-05-02 13:29:36 -07:00

WifiStateTracker.java

Add external dependency API.

2011-04-07 12:28:37 -07:00

WpsConfiguration.aidl

WPS fixes and refactor

2010-12-13 14:50:51 -08:00

WpsConfiguration.java

WPS fixes and refactor

2010-12-13 14:50:51 -08:00

WpsResult.aidl

Fix WPS to provides immediate feedback

2011-01-14 09:58:07 -08:00

WpsResult.java

Fix WPS to provides immediate feedback

2011-01-14 09:58:07 -08:00

WpsStateMachine.java

Rename HierarchicalStateMachine and HierarchicalState to StateMachine and State.

2011-04-18 14:55:10 -07:00