commit be8b76480fdfda0a8637fe3aee0665cf66e31777
author Daniel Chapin <chapin@google.com> Wed Dec 06 22:21:07 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Dec 06 22:21:07 2017 +0000
tree 6526b5ffa3ea945fd408a1b7ee59c23051893506
parent 7edd77f1e289417ee41c582e3163e4552beb52de
parent 9d7b9a06f3c0e610573d8d0655d633c39e83b467

Merge "SoftApManager: Start state machine after initializing WifiNative"

service/java/com/android/server/wifi/SoftApManager.java

diff --git a/service/java/com/android/server/wifi/SoftApManager.java b/service/java/com/android/server/wifi/SoftApManager.java
index 429e3c3..b79c901 100644
--- a/service/java/com/android/server/wifi/SoftApManager.java
+++ b/service/java/com/android/server/wifi/SoftApManager.java
@@ -106,8 +106,6 @@
                          WifiApConfigStore wifiApConfigStore,
                          @NonNull SoftApModeConfiguration apConfig,
                          WifiMetrics wifiMetrics) {
-        mStateMachine = new SoftApStateMachine(looper);
-
         mContext = context;
         mWifiNative = wifiNative;
         mCountryCode = countryCode;
@@ -124,6 +122,7 @@
             mApConfig = config;
         }
         mWifiMetrics = wifiMetrics;
+        mStateMachine = new SoftApStateMachine(looper);
     }
 
     /**