diff options
| author | Elliott Hughes <enh@google.com> | 2014-08-18 19:48:26 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-08-18 19:48:26 +0000 |
| commit | c97de79ad268fdc867b618c4a91dc76ce9b61e2b (patch) | |
| tree | e275e0c3217af0d4ea597b37da836a9f3c688000 | |
| parent | 162b40e4f9584a61aa74a651e3918c1b5c195fb8 (diff) | |
| parent | 400ec1b938ddc8da367c594105bfaa7485c80564 (diff) | |
| download | frameworks_base-c97de79ad268fdc867b618c4a91dc76ce9b61e2b.zip frameworks_base-c97de79ad268fdc867b618c4a91dc76ce9b61e2b.tar.gz frameworks_base-c97de79ad268fdc867b618c4a91dc76ce9b61e2b.tar.bz2 | |
am 400ec1b9: am 085889e3: Merge "WifiP2pWfdInfo set device type bugfix"
* commit '400ec1b938ddc8da367c594105bfaa7485c80564':
WifiP2pWfdInfo set device type bugfix
| -rw-r--r-- | wifi/java/android/net/wifi/p2p/WifiP2pWfdInfo.java | 1 |
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; } |