diff options
| author | Irfan Sheriff <isheriff@android.com> | 2012-12-03 12:41:38 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-12-03 12:41:38 -0800 |
| commit | a5c6166c956f2471c688de78b408bfad241a173d (patch) | |
| tree | 511ac70911e43932b5cc06a33f668c10192e51ef /wifi/java | |
| parent | 19c84ea62122fb5c0025b9233424313b9dc42419 (diff) | |
| parent | 9648a484e0f5e0d90c76e83b2ec6a12dec1e3d83 (diff) | |
| download | frameworks_base-a5c6166c956f2471c688de78b408bfad241a173d.zip frameworks_base-a5c6166c956f2471c688de78b408bfad241a173d.tar.gz frameworks_base-a5c6166c956f2471c688de78b408bfad241a173d.tar.bz2 | |
am 9648a484: am cdd03f54: Merge "Try go-negotiation when invocation request is deferred."
* commit '9648a484e0f5e0d90c76e83b2ec6a12dec1e3d83':
Try go-negotiation when invocation request is deferred.
Diffstat (limited to 'wifi/java')
| -rw-r--r-- | wifi/java/android/net/wifi/p2p/WifiP2pService.java | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/wifi/java/android/net/wifi/p2p/WifiP2pService.java b/wifi/java/android/net/wifi/p2p/WifiP2pService.java index be5cdad..30764fb 100644 --- a/wifi/java/android/net/wifi/p2p/WifiP2pService.java +++ b/wifi/java/android/net/wifi/p2p/WifiP2pService.java @@ -1375,7 +1375,18 @@ public class WifiP2pService extends IWifiP2pManager.Stub { removeClientFromList(netId, mSavedPeerConfig.deviceAddress, true); } - // invocation is failed or deferred. Try another way to connect. + // invocation is failed. Try another way to connect. + mSavedPeerConfig.netId = WifiP2pGroup.PERSISTENT_NET_ID; + if (connect(mSavedPeerConfig, NO_REINVOCATION) == CONNECT_FAILURE) { + handleGroupCreationFailure(); + transitionTo(mInactiveState); + } + } else if (status == P2pStatus.INFORMATION_IS_CURRENTLY_UNAVAILABLE) { + + // Devices setting persistent_reconnect to 0 in wpa_supplicant + // always defer the invocation request and return + // "information is currently unable" error. + // So, try another way to connect for interoperability. mSavedPeerConfig.netId = WifiP2pGroup.PERSISTENT_NET_ID; if (connect(mSavedPeerConfig, NO_REINVOCATION) == CONNECT_FAILURE) { handleGroupCreationFailure(); |