diff options
| author | Elliott Hughes <enh@google.com> | 2014-08-18 19:38:36 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-08-18 19:38:36 +0000 |
| commit | 400ec1b938ddc8da367c594105bfaa7485c80564 (patch) | |
| tree | 7a25a7591b74a2eed33265838681a8a54115f7e5 | |
| parent | 72d3cef8675b4a8eced300adeb148a835b7fdd57 (diff) | |
| parent | 085889e37f5798dd50ec8c66cd0e2cd2ec37c6bd (diff) | |
| download | frameworks_base-400ec1b938ddc8da367c594105bfaa7485c80564.zip frameworks_base-400ec1b938ddc8da367c594105bfaa7485c80564.tar.gz frameworks_base-400ec1b938ddc8da367c594105bfaa7485c80564.tar.bz2 | |
am 085889e3: Merge "WifiP2pWfdInfo set device type bugfix"
* commit '085889e37f5798dd50ec8c66cd0e2cd2ec37c6bd':
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; } |