summaryrefslogtreecommitdiffstats
path: root/wifi/java/android/net/wifi/p2p
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2014-08-18 19:28:31 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2014-08-16 04:08:14 +0000
commit085889e37f5798dd50ec8c66cd0e2cd2ec37c6bd (patch)
tree0d652e5a7757aa4e7a0637f522a1b3b75aecfd9d /wifi/java/android/net/wifi/p2p
parent708da44695216b57a9389a74b95b4ef6f530120a (diff)
parent8b3b81000c6fe7e6e5bab0f3e2d24022d3eaaea8 (diff)
downloadframeworks_base-085889e37f5798dd50ec8c66cd0e2cd2ec37c6bd.zip
frameworks_base-085889e37f5798dd50ec8c66cd0e2cd2ec37c6bd.tar.gz
frameworks_base-085889e37f5798dd50ec8c66cd0e2cd2ec37c6bd.tar.bz2
Merge "WifiP2pWfdInfo set device type bugfix"
Diffstat (limited to 'wifi/java/android/net/wifi/p2p')
-rw-r--r--wifi/java/android/net/wifi/p2p/WifiP2pWfdInfo.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/wifi/java/android/net/wifi/p2p/WifiP2pWfdInfo.java b/wifi/java/android/net/wifi/p2p/WifiP2pWfdInfo.java
index d65d03e..92c7e36 100644
--- a/wifi/java/android/net/wifi/p2p/WifiP2pWfdInfo.java
+++ b/wifi/java/android/net/wifi/p2p/WifiP2pWfdInfo.java
@@ -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;
}