diff options
| author | Irfan Sheriff <isheriff@google.com> | 2012-08-28 16:05:43 -0700 |
|---|---|---|
| committer | Jean-Baptiste Queru <jbq@google.com> | 2012-08-29 08:36:17 -0700 |
| commit | 127efc4e258429dd4fe8f12817b701bc340d23fa (patch) | |
| tree | 773499a7cb76a856234ce163e1121c6e40633bc7 /wifi/java | |
| parent | ad955fe87f44b43dbb2842fdcbe4e62900b5a07f (diff) | |
| download | frameworks_base-127efc4e258429dd4fe8f12817b701bc340d23fa.zip frameworks_base-127efc4e258429dd4fe8f12817b701bc340d23fa.tar.gz frameworks_base-127efc4e258429dd4fe8f12817b701bc340d23fa.tar.bz2 | |
Fix join scenario with provision discovery
Bug: 7072467
Change-Id: I8aafd5cee1055463aeda26ad313071cfe4e335c6
Diffstat (limited to 'wifi/java')
| -rw-r--r-- | wifi/java/android/net/wifi/p2p/WifiP2pService.java | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/wifi/java/android/net/wifi/p2p/WifiP2pService.java b/wifi/java/android/net/wifi/p2p/WifiP2pService.java index 0212552..0be2b27 100644 --- a/wifi/java/android/net/wifi/p2p/WifiP2pService.java +++ b/wifi/java/android/net/wifi/p2p/WifiP2pService.java @@ -1120,7 +1120,7 @@ public class WifiP2pService extends IWifiP2pManager.Stub { if (mSavedPeerConfig.wps.setup == WpsInfo.PBC) { if (DBG) logd("Found a match " + mSavedPeerConfig); - mWifiNative.p2pConnect(mSavedPeerConfig, FORM_GROUP); + p2pConnectWithPinDisplay(mSavedPeerConfig); transitionTo(mGroupNegotiationState); } break; @@ -1133,7 +1133,7 @@ public class WifiP2pService extends IWifiP2pManager.Stub { if (DBG) logd("Found a match " + mSavedPeerConfig); /* we already have the pin */ if (!TextUtils.isEmpty(mSavedPeerConfig.wps.pin)) { - mWifiNative.p2pConnect(mSavedPeerConfig, FORM_GROUP); + p2pConnectWithPinDisplay(mSavedPeerConfig); transitionTo(mGroupNegotiationState); } else { mJoinExistingGroup = false; @@ -1152,7 +1152,7 @@ public class WifiP2pService extends IWifiP2pManager.Stub { if (mSavedPeerConfig.wps.setup == WpsInfo.DISPLAY) { if (DBG) logd("Found a match " + mSavedPeerConfig); mSavedPeerConfig.wps.pin = provDisc.pin; - mWifiNative.p2pConnect(mSavedPeerConfig, FORM_GROUP); + p2pConnectWithPinDisplay(mSavedPeerConfig); if (!sendShowPinReqToFrontApp(provDisc.pin)) { notifyInvitationSent(provDisc.pin, device.deviceAddress); } @@ -1861,7 +1861,7 @@ public class WifiP2pService extends IWifiP2pManager.Stub { return NEEDS_PROVISION_REQ; } - p2pConnectWithPinDisplay(config, join); + p2pConnectWithPinDisplay(config); return CONNECT_SUCCESS; } @@ -1968,8 +1968,14 @@ public class WifiP2pService extends IWifiP2pManager.Stub { return deviceAddress; } - private void p2pConnectWithPinDisplay(WifiP2pConfig config, boolean join) { - String pin = mWifiNative.p2pConnect(config, join); + private void p2pConnectWithPinDisplay(WifiP2pConfig config) { + WifiP2pDevice dev = mPeers.get(config.deviceAddress); + if (dev == null) { + loge("target device is not found " + config.deviceAddress); + return; + } + + String pin = mWifiNative.p2pConnect(config, dev.isGroupOwner()); try { Integer.parseInt(pin); if (!sendShowPinReqToFrontApp(pin)) { |