diff options
| author | Irfan Sheriff <isheriff@google.com> | 2012-10-23 09:36:44 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-10-23 09:36:48 -0700 |
| commit | bf310d1f6ef4ac167f66a4e31724c7766981bd84 (patch) | |
| tree | 655203666d93c872b694d9c82c205388301be806 /wifi | |
| parent | 1c8135adba37ac09fe661180237df446611daa4b (diff) | |
| parent | 51aec5ed5f78bfc5dea134fa88ef07fcdd572ba2 (diff) | |
| download | frameworks_base-bf310d1f6ef4ac167f66a4e31724c7766981bd84.zip frameworks_base-bf310d1f6ef4ac167f66a4e31724c7766981bd84.tar.gz frameworks_base-bf310d1f6ef4ac167f66a4e31724c7766981bd84.tar.bz2 | |
Merge "Fix issues shown on CTS tests" into jb-mr1-dev
Diffstat (limited to 'wifi')
| -rw-r--r-- | wifi/java/android/net/wifi/p2p/WifiP2pService.java | 22 |
1 files changed, 20 insertions, 2 deletions
diff --git a/wifi/java/android/net/wifi/p2p/WifiP2pService.java b/wifi/java/android/net/wifi/p2p/WifiP2pService.java index f0aef92..03a0434 100644 --- a/wifi/java/android/net/wifi/p2p/WifiP2pService.java +++ b/wifi/java/android/net/wifi/p2p/WifiP2pService.java @@ -1079,7 +1079,21 @@ public class WifiP2pService extends IWifiP2pManager.Stub { // remain at this state. } break; - default: + case WifiMonitor.P2P_GROUP_STARTED_EVENT: + mGroup = (WifiP2pGroup) message.obj; + if (DBG) logd(getName() + " group started"); + + // We hit this scenario when a persistent group is reinvoked + if (mGroup.getNetworkId() == WifiP2pGroup.PERSISTENT_NET_ID) { + mAutonomousGroup = false; + deferMessage(message); + transitionTo(mGroupNegotiationState); + } else { + loge("Unexpected group creation, remove " + mGroup); + mWifiNative.p2pGroupRemove(mGroup.getInterface()); + } + break; + default: return NOT_HANDLED; } return HANDLED; @@ -2338,6 +2352,10 @@ public class WifiP2pService extends IWifiP2pManager.Stub { } NetworkUtils.resetConnections(mGroup.getInterface(), NetworkUtils.RESET_ALL_ADDRESSES); + // Clear any timeout that was set. This is essential for devices + // that reuse the main p2p interface for a created group. + mWifiNative.setP2pGroupIdle(mGroup.getInterface(), 0); + mGroup = null; mWifiNative.p2pFlush(); if (mPeers.remove(mPeersLostDuringConnection)) sendP2pPeersChangedBroadcast(); @@ -2349,7 +2367,7 @@ public class WifiP2pService extends IWifiP2pManager.Stub { mWifiChannel.sendMessage(WifiP2pService.DISCONNECT_WIFI_REQUEST, 0); mTempoarilyDisconnectedWifi = false; } - } + } //State machine initiated requests can have replyTo set to null indicating //there are no recipients, we ignore those reply actions |