am 1c9126c6: am 59c73b92: Merge "Convert soft ap config store to state machine" into ics-mr1

* commit '1c9126c64b56b6465fd551680461caed2e1ea20d': Convert soft ap config store to state machine
2011-11-09 21:51:12 +00:00
parent 41a3bdcbef 1c9126c64b
commit af139db574
3 changed files with 214 additions and 173 deletions
--- a/services/java/com/android/server/WifiService.java
+++ b/services/java/com/android/server/WifiService.java
@@ -619,12 +619,7 @@ public class WifiService extends IWifiManager.Stub {
     */
    public WifiConfiguration getWifiApConfiguration() {
        enforceAccessPermission();
-        if (mWifiStateMachineChannel != null) {
-            return mWifiStateMachine.syncGetWifiApConfiguration(mWifiStateMachineChannel);
-        } else {
-            Slog.e(TAG, "mWifiStateMachineChannel is not initialized");
-            return null;
-        }
+        return mWifiStateMachine.syncGetWifiApConfiguration();
    }

    /**