am 400ec1b9: am 085889e3: Merge "WifiP2pWfdInfo set device type bugfix"

* commit '400ec1b938ddc8da367c594105bfaa7485c80564':
  WifiP2pWfdInfo set device type bugfix
This commit is contained in:
Elliott Hughes
2014-08-18 19:48:26 +00:00
committed by Android Git Automerger

View File

@@ -77,6 +77,7 @@ public class WifiP2pWfdInfo implements Parcelable {
public boolean setDeviceType(int deviceType) {
if (deviceType >= WFD_SOURCE && deviceType <= SOURCE_OR_PRIMARY_SINK) {
mDeviceInfo &= ~DEVICE_TYPE;
mDeviceInfo |= deviceType;
return true;
}