Merge "Remove persistent behavior"
diff --git a/wifi/java/android/net/wifi/WifiNative.java b/wifi/java/android/net/wifi/WifiNative.java
index 2cd54d9..450f816 100644
--- a/wifi/java/android/net/wifi/WifiNative.java
+++ b/wifi/java/android/net/wifi/WifiNative.java
@@ -284,8 +284,11 @@
                 break;
         }
 
+        //TODO: Add persist behavior once the supplicant interaction is fixed for both
+        // group and client scenarios
         /* Persist unless there is an explicit request to not do so*/
-        if (config.persist != WifiP2pConfig.Persist.NO) args.add("persistent");
+        //if (config.persist != WifiP2pConfig.Persist.NO) args.add("persistent");
+
         if (joinExistingGroup) args.add("join");
 
         int groupOwnerIntent = config.groupOwnerIntent;