drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 48c45d0e: Merge "Fix join scenario with provision discovery"

Browse Source 
* commit '48c45d0e3bcacebfc3635bc893875146b7ecb787':
  Fix join scenario with provision discovery
This commit is contained in:
Irfan Sheriff
2012-08-29 10:49:20 -07:00
committed by Android Git Automerger
parent 393e3170b3 48c45d0e3b
commit c5f34bd40b
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
wifi/java/android/net/wifi/p2p/WifiP2pService.java
View File

@ -1120,7 +1120,7 @@ public class WifiP2pService extends IWifiP2pManager.Stub {
if (mSavedPeerConfig.wps.setup == WpsInfo.PBC) { if (mSavedPeerConfig.wps.setup == WpsInfo.PBC) {
if (DBG) logd("Found a match " + mSavedPeerConfig); if (DBG) logd("Found a match " + mSavedPeerConfig);
mWifiNative.p2pConnect(mSavedPeerConfig, FORM_GROUP); p2pConnectWithPinDisplay(mSavedPeerConfig);
transitionTo(mGroupNegotiationState); transitionTo(mGroupNegotiationState);
} }
break; break;
@ -1133,7 +1133,7 @@ public class WifiP2pService extends IWifiP2pManager.Stub {
if (DBG) logd("Found a match " + mSavedPeerConfig); if (DBG) logd("Found a match " + mSavedPeerConfig);
/* we already have the pin */ /* we already have the pin */
if (!TextUtils.isEmpty(mSavedPeerConfig.wps.pin)) { if (!TextUtils.isEmpty(mSavedPeerConfig.wps.pin)) {
mWifiNative.p2pConnect(mSavedPeerConfig, FORM_GROUP); p2pConnectWithPinDisplay(mSavedPeerConfig);
transitionTo(mGroupNegotiationState); transitionTo(mGroupNegotiationState);
} else { } else {
mJoinExistingGroup = false; mJoinExistingGroup = false;
@ -1152,7 +1152,7 @@ public class WifiP2pService extends IWifiP2pManager.Stub {
if (mSavedPeerConfig.wps.setup == WpsInfo.DISPLAY) { if (mSavedPeerConfig.wps.setup == WpsInfo.DISPLAY) {
if (DBG) logd("Found a match " + mSavedPeerConfig); if (DBG) logd("Found a match " + mSavedPeerConfig);
mSavedPeerConfig.wps.pin = provDisc.pin; mSavedPeerConfig.wps.pin = provDisc.pin;
mWifiNative.p2pConnect(mSavedPeerConfig, FORM_GROUP); p2pConnectWithPinDisplay(mSavedPeerConfig);
if (!sendShowPinReqToFrontApp(provDisc.pin)) { if (!sendShowPinReqToFrontApp(provDisc.pin)) {
notifyInvitationSent(provDisc.pin, device.deviceAddress); notifyInvitationSent(provDisc.pin, device.deviceAddress);
} }
@ -1861,7 +1861,7 @@ public class WifiP2pService extends IWifiP2pManager.Stub {
return NEEDS_PROVISION_REQ; return NEEDS_PROVISION_REQ;
} }
p2pConnectWithPinDisplay(config, join); p2pConnectWithPinDisplay(config);
return CONNECT_SUCCESS; return CONNECT_SUCCESS;
} }
@ -1968,8 +1968,14 @@ public class WifiP2pService extends IWifiP2pManager.Stub {
return deviceAddress; return deviceAddress;
} }
private void p2pConnectWithPinDisplay(WifiP2pConfig config, boolean join) { private void p2pConnectWithPinDisplay(WifiP2pConfig config) {
String pin = mWifiNative.p2pConnect(config, join); 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 { try {
Integer.parseInt(pin); Integer.parseInt(pin);
if (!sendShowPinReqToFrontApp(pin)) { if (!sendShowPinReqToFrontApp(pin)) {