[AWARE] create interface before connect success

After restart, when first time using Aware to create NDP, onConnectSuccess send before all interface created. That may cause NDP unavailable.
Change the order of create interface and onConnectSuccess.

Bug: 124653166
Test: atest android.net.wifi
Test: atest com.android.server.wifi
Test: ACTS DataPathTest
Change-Id: I96d1eb4da51046b6d6928287a439965c8c50bff6

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!?");