P2p fixes (265f278a) · Commits · e / os / android_frameworks_base

wifi/java/android/net/wifi/WifiMonitor.java

+5 −0

Original line number	Original line	Diff line number	Diff line
	@@ -217,6 +217,8 @@ public class WifiMonitor {
	pri_dev_type=1-0050F204-1 name='p2p-TEST2' config_methods=0x188 dev_capab=0x27		pri_dev_type=1-0050F204-1 name='p2p-TEST2' config_methods=0x188 dev_capab=0x27
	group_capab=0x0 */		group_capab=0x0 */
	private static final String P2P_PROV_DISC_SHOW_PIN_STR = "P2P-PROV-DISC-SHOW-PIN";		private static final String P2P_PROV_DISC_SHOW_PIN_STR = "P2P-PROV-DISC-SHOW-PIN";
			/* P2P-PROV-DISC-FAILURE p2p_dev_addr=42:fc:89:e1:e2:27 */
			private static final String P2P_PROV_DISC_FAILURE_STR = "P2P-PROV-DISC-FAILURE";

	/*		/*
	* Protocol format is as follows.<br>		* Protocol format is as follows.<br>
	@@ -319,6 +321,7 @@ public class WifiMonitor {
	public static final int P2P_PROV_DISC_SHOW_PIN_EVENT = BASE + 36;		public static final int P2P_PROV_DISC_SHOW_PIN_EVENT = BASE + 36;
	public static final int P2P_FIND_STOPPED_EVENT = BASE + 37;		public static final int P2P_FIND_STOPPED_EVENT = BASE + 37;
	public static final int P2P_SERV_DISC_RESP_EVENT = BASE + 38;		public static final int P2P_SERV_DISC_RESP_EVENT = BASE + 38;
			public static final int P2P_PROV_DISC_FAILURE_EVENT = BASE + 39;

	/* hostap events */		/* hostap events */
	public static final int AP_STA_DISCONNECTED_EVENT = BASE + 41;		public static final int AP_STA_DISCONNECTED_EVENT = BASE + 41;
	@@ -615,6 +618,8 @@ public class WifiMonitor {
	} else if (dataString.startsWith(P2P_PROV_DISC_SHOW_PIN_STR)) {		} else if (dataString.startsWith(P2P_PROV_DISC_SHOW_PIN_STR)) {
	mStateMachine.sendMessage(P2P_PROV_DISC_SHOW_PIN_EVENT,		mStateMachine.sendMessage(P2P_PROV_DISC_SHOW_PIN_EVENT,
	new WifiP2pProvDiscEvent(dataString));		new WifiP2pProvDiscEvent(dataString));
			} else if (dataString.startsWith(P2P_PROV_DISC_FAILURE_STR)) {
			mStateMachine.sendMessage(P2P_PROV_DISC_FAILURE_EVENT);
	} else if (dataString.startsWith(P2P_SERV_DISC_RESP_STR)) {		} else if (dataString.startsWith(P2P_SERV_DISC_RESP_STR)) {
	List<WifiP2pServiceResponse> list = WifiP2pServiceResponse.newInstance(dataString);		List<WifiP2pServiceResponse> list = WifiP2pServiceResponse.newInstance(dataString);
	if (list != null) {		if (list != null) {

wifi/java/android/net/wifi/p2p/WifiP2pDevice.java

+12 −0

Original line number	Original line	Diff line number	Diff line
	@@ -260,6 +260,18 @@ public class WifiP2pDevice implements Parcelable {
	return (groupCapability & GROUP_CAPAB_GROUP_LIMIT) != 0;		return (groupCapability & GROUP_CAPAB_GROUP_LIMIT) != 0;
	}		}

			/** @hide */
			public void update(WifiP2pDevice device) {
			if (device == null \|\| device.deviceAddress == null) return;
			deviceName = device.deviceName;
			primaryDeviceType = device.primaryDeviceType;
			secondaryDeviceType = device.secondaryDeviceType;
			wpsConfigMethodsSupported = device.wpsConfigMethodsSupported;
			deviceCapability = device.deviceCapability;
			groupCapability = device.groupCapability;
			wfdInfo = device.wfdInfo;
			}

	@Override		@Override
	public boolean equals(Object obj) {		public boolean equals(Object obj) {
	if (this == obj) return true;		if (this == obj) return true;

wifi/java/android/net/wifi/p2p/WifiP2pService.java

+44 −8

Original line number	Original line	Diff line number	Diff line
	@@ -346,6 +346,7 @@ public class WifiP2pService extends IWifiP2pManager.Stub {

	private GroupCreatedState mGroupCreatedState = new GroupCreatedState();		private GroupCreatedState mGroupCreatedState = new GroupCreatedState();
	private UserAuthorizingJoinState mUserAuthorizingJoinState = new UserAuthorizingJoinState();		private UserAuthorizingJoinState mUserAuthorizingJoinState = new UserAuthorizingJoinState();
			private OngoingGroupRemovalState mOngoingGroupRemovalState = new OngoingGroupRemovalState();

	private WifiNative mWifiNative = new WifiNative(mInterface);		private WifiNative mWifiNative = new WifiNative(mInterface);
	private WifiMonitor mWifiMonitor = new WifiMonitor(this, mWifiNative);		private WifiMonitor mWifiMonitor = new WifiMonitor(this, mWifiNative);
	@@ -389,6 +390,7 @@ public class WifiP2pService extends IWifiP2pManager.Stub {
	addState(mGroupNegotiationState, mGroupCreatingState);		addState(mGroupNegotiationState, mGroupCreatingState);
	addState(mGroupCreatedState, mP2pEnabledState);		addState(mGroupCreatedState, mP2pEnabledState);
	addState(mUserAuthorizingJoinState, mGroupCreatedState);		addState(mUserAuthorizingJoinState, mGroupCreatedState);
			addState(mOngoingGroupRemovalState, mGroupCreatedState);

	if (p2pSupported) {		if (p2pSupported) {
	setInitialState(mP2pDisabledState);		setInitialState(mP2pDisabledState);
	@@ -545,6 +547,7 @@ public class WifiP2pService extends IWifiP2pManager.Stub {
	case DhcpStateMachine.CMD_PRE_DHCP_ACTION:		case DhcpStateMachine.CMD_PRE_DHCP_ACTION:
	case DhcpStateMachine.CMD_POST_DHCP_ACTION:		case DhcpStateMachine.CMD_POST_DHCP_ACTION:
	case DhcpStateMachine.CMD_ON_QUIT:		case DhcpStateMachine.CMD_ON_QUIT:
			case WifiMonitor.P2P_PROV_DISC_FAILURE_EVENT:
	break;		break;
	/* unexpected group created, remove */		/* unexpected group created, remove */
	case WifiMonitor.P2P_GROUP_STARTED_EVENT:		case WifiMonitor.P2P_GROUP_STARTED_EVENT:
	@@ -1183,6 +1186,11 @@ public class WifiP2pService extends IWifiP2pManager.Stub {
	transitionTo(mGroupNegotiationState);		transitionTo(mGroupNegotiationState);
	}		}
	break;		break;
			case WifiMonitor.P2P_PROV_DISC_FAILURE_EVENT:
			loge("provision discovery failed");
			handleGroupCreationFailure();
			transitionTo(mInactiveState);
			break;
	default:		default:
	return NOT_HANDLED;		return NOT_HANDLED;
	}		}
	@@ -1228,6 +1236,8 @@ public class WifiP2pService extends IWifiP2pManager.Stub {
	P2pStateMachine.this, mGroup.getInterface());		P2pStateMachine.this, mGroup.getInterface());
	mDhcpStateMachine.sendMessage(DhcpStateMachine.CMD_START_DHCP);		mDhcpStateMachine.sendMessage(DhcpStateMachine.CMD_START_DHCP);
	WifiP2pDevice groupOwner = mGroup.getOwner();		WifiP2pDevice groupOwner = mGroup.getOwner();
			/* update group owner details with the ones found at discovery */
			groupOwner.update(mPeers.get(groupOwner.deviceAddress));
	mPeers.updateStatus(groupOwner.deviceAddress, WifiP2pDevice.CONNECTED);		mPeers.updateStatus(groupOwner.deviceAddress, WifiP2pDevice.CONNECTED);
	sendP2pPeersChangedBroadcast();		sendP2pPeersChangedBroadcast();
	}		}
	@@ -1303,7 +1313,7 @@ public class WifiP2pService extends IWifiP2pManager.Stub {
	deviceAddress.equals(mSavedProvDiscDevice.deviceAddress)) {		deviceAddress.equals(mSavedProvDiscDevice.deviceAddress)) {
	mSavedProvDiscDevice = null;		mSavedProvDiscDevice = null;
	}		}
	mGroup.addClient(deviceAddress);		mGroup.addClient(mPeers.get(deviceAddress));
	mPeers.updateStatus(deviceAddress, WifiP2pDevice.CONNECTED);		mPeers.updateStatus(deviceAddress, WifiP2pDevice.CONNECTED);
	if (DBG) logd(getName() + " ap sta connected");		if (DBG) logd(getName() + " ap sta connected");
	sendP2pPeersChangedBroadcast();		sendP2pPeersChangedBroadcast();
	@@ -1357,6 +1367,7 @@ public class WifiP2pService extends IWifiP2pManager.Stub {
	case WifiP2pManager.REMOVE_GROUP:		case WifiP2pManager.REMOVE_GROUP:
	if (DBG) logd(getName() + " remove group");		if (DBG) logd(getName() + " remove group");
	if (mWifiNative.p2pGroupRemove(mGroup.getInterface())) {		if (mWifiNative.p2pGroupRemove(mGroup.getInterface())) {
			transitionTo(mOngoingGroupRemovalState);
	replyToMessage(message, WifiP2pManager.REMOVE_GROUP_SUCCEEDED);		replyToMessage(message, WifiP2pManager.REMOVE_GROUP_SUCCEEDED);
	} else {		} else {
	handleGroupRemoved();		handleGroupRemoved();
	@@ -1534,6 +1545,30 @@ public class WifiP2pService extends IWifiP2pManager.Stub {
	}		}
	}		}

			class OngoingGroupRemovalState extends State {
			@Override
			public void enter() {
			if (DBG) logd(getName());
			}

			@Override
			public boolean processMessage(Message message) {
			if (DBG) logd(getName() + message.toString());
			switch (message.what) {
			// Group removal ongoing. Multiple calls
			// end up removing persisted network. Do nothing.
			case WifiP2pManager.REMOVE_GROUP:
			replyToMessage(message, WifiP2pManager.REMOVE_GROUP_SUCCEEDED);
			break;
			// Parent state will transition out of this state
			// when removal is complete
			default:
			return NOT_HANDLED;
			}
			return HANDLED;
			}
			}

	private void sendP2pStateChangedBroadcast(boolean enabled) {		private void sendP2pStateChangedBroadcast(boolean enabled) {
	final Intent intent = new Intent(WifiP2pManager.WIFI_P2P_STATE_CHANGED_ACTION);		final Intent intent = new Intent(WifiP2pManager.WIFI_P2P_STATE_CHANGED_ACTION);
	intent.addFlags(Intent.FLAG_RECEIVER_REGISTERED_ONLY_BEFORE_BOOT);		intent.addFlags(Intent.FLAG_RECEIVER_REGISTERED_ONLY_BEFORE_BOOT);
	@@ -1858,15 +1893,16 @@ public class WifiP2pService extends IWifiP2pManager.Stub {
	}		}
	if (DBG) logd("netId related with " + dev.deviceAddress + " = " + netId);		if (DBG) logd("netId related with " + dev.deviceAddress + " = " + netId);
	if (netId >= 0) {		if (netId >= 0) {

	// Invoke the persistent group.		// Invoke the persistent group.
	if (!mWifiNative.p2pReinvoke(netId, dev.deviceAddress)) {		if (mWifiNative.p2pReinvoke(netId, dev.deviceAddress)) {
	loge("p2pReinvoke() failed");
	return CONNECT_FAILURE;
	}
	// Save network id. It'll be used when an invitation result event is received.		// Save network id. It'll be used when an invitation result event is received.
	mSavedPeerConfig.netId = netId;		mSavedPeerConfig.netId = netId;
	return CONNECT_SUCCESS;		return CONNECT_SUCCESS;
			} else {
			loge("p2pReinvoke() failed, update networks");
			updatePersistentNetworks();
			// continue with negotiation
			}
	}		}
	}		}