diff options
author | Irfan Sheriff <isheriff@google.com> | 2011-08-31 11:35:45 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-08-31 11:35:45 -0700 |
commit | 2a62b43e671ef893e606292e82bc9fb9a09a3bf5 (patch) | |
tree | fac21cec19bf2e33783b7630e4a09a35d9d1ff4c /wifi | |
parent | 329b79713c06944c02a431081e75ef5e1862d32f (diff) | |
parent | f9cb1d7082870d9fc5f90290e717065441f611ac (diff) | |
download | frameworks_base-2a62b43e671ef893e606292e82bc9fb9a09a3bf5.zip frameworks_base-2a62b43e671ef893e606292e82bc9fb9a09a3bf5.tar.gz frameworks_base-2a62b43e671ef893e606292e82bc9fb9a09a3bf5.tar.bz2 |
Merge "Remove persistent behavior"
Diffstat (limited to 'wifi')
-rw-r--r-- | wifi/java/android/net/wifi/WifiNative.java | 5 |
1 files changed, 4 insertions, 1 deletions
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 @@ public class WifiNative { 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; |