commit c97de79ad268fdc867b618c4a91dc76ce9b61e2b
author Elliott Hughes <enh@google.com> Mon Aug 18 19:48:26 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Mon Aug 18 19:48:26 2014 +0000
tree e275e0c3217af0d4ea597b37da836a9f3c688000
parent 162b40e4f9584a61aa74a651e3918c1b5c195fb8
parent 400ec1b938ddc8da367c594105bfaa7485c80564

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

* commit '400ec1b938ddc8da367c594105bfaa7485c80564':
  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;
         }