commit 400ec1b938ddc8da367c594105bfaa7485c80564
author Elliott Hughes <enh@google.com> Mon Aug 18 19:38:36 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Mon Aug 18 19:38:36 2014 +0000
tree 7a25a7591b74a2eed33265838681a8a54115f7e5
parent 72d3cef8675b4a8eced300adeb148a835b7fdd57
parent 085889e37f5798dd50ec8c66cd0e2cd2ec37c6bd

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

* commit '085889e37f5798dd50ec8c66cd0e2cd2ec37c6bd':
  WifiP2pWfdInfo set device type bugfix

wifi/java/android/net/wifi/p2p/WifiP2pWfdInfo.java

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 boolean setDeviceType(int deviceType) {
         if (deviceType >= WFD_SOURCE && deviceType <= SOURCE_OR_PRIMARY_SINK) {
+            mDeviceInfo &= ~DEVICE_TYPE;
             mDeviceInfo |= deviceType;
             return true;
         }