1 files changed, 4 insertions, 3 deletions
diff --git a/service/java/com/android/server/wifi/aware/WifiAwareStateManager.java b/service/java/com/android/server/wifi/aware/WifiAwareStateManager.java
index a117ecc38..072788081 100644
--- a/service/java/com/android/server/wifi/aware/WifiAwareStateManager.java
+++ b/service/java/com/android/server/wifi/aware/WifiAwareStateManager.java
@@ -2577,6 +2577,10 @@ public class WifiAwareStateManager implements WifiAwareShellCommand.DelegatedShe
         }
 
         if (completedCommand.arg1 == COMMAND_TYPE_CONNECT) {
+            if (mCurrentAwareConfiguration == null) { // enabled (as opposed to re-configured)
+                createAllDataPathInterfaces();
+            }
+
             Bundle data = completedCommand.getData();
 
             int clientId = completedCommand.arg2;
@@ -2615,9 +2619,6 @@ public class WifiAwareStateManager implements WifiAwareShellCommand.DelegatedShe
             return;
         }
 
-        if (mCurrentAwareConfiguration == null) { // enabled (as opposed to re-configured)
-            createAllDataPathInterfaces();
-        }
         mCurrentAwareConfiguration = mergeConfigRequests(null);
         if (mCurrentAwareConfiguration == null) {
             Log.wtf(TAG, "onConfigCompletedLocal: got a null merged configuration after config!?");