diff options
| author | Pankaj Kanwar <pkanwar@google.com> | 2015-10-15 01:57:40 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-10-15 01:57:40 +0000 |
| commit | a29ea4f648cc12ad81bc258ad11ae3d63cd4921f (patch) | |
| tree | 525f804ab28615842fd653a48e00f2f6c76c01a3 | |
| parent | ca45280461867c973acb736f6e8efe1518c03dc9 (diff) | |
| parent | 12a1007dc04897e000f91ae43f9ca90cd7441f9d (diff) | |
| download | android_frameworks_opt_net_wifi-a29ea4f648cc12ad81bc258ad11ae3d63cd4921f.tar.gz android_frameworks_opt_net_wifi-a29ea4f648cc12ad81bc258ad11ae3d63cd4921f.tar.bz2 android_frameworks_opt_net_wifi-a29ea4f648cc12ad81bc258ad11ae3d63cd4921f.zip | |
am 12a1007d: Merge "Fix center frequency parsing bug." into mnc-dr-dev
* commit '12a1007dc04897e000f91ae43f9ca90cd7441f9d':
Fix center frequency parsing bug.
| -rw-r--r-- | service/java/com/android/server/wifi/WifiNative.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/service/java/com/android/server/wifi/WifiNative.java b/service/java/com/android/server/wifi/WifiNative.java index ca1ddc96c..6b9cfd6fb 100644 --- a/service/java/com/android/server/wifi/WifiNative.java +++ b/service/java/com/android/server/wifi/WifiNative.java @@ -1468,8 +1468,8 @@ public class WifiNative { int secondChanelOffset = 0; byte channelMode = 0; - byte centerFreqIndex1 = 0; - byte centerFreqIndex2 = 0; + int centerFreqIndex1 = 0; + int centerFreqIndex2 = 0; boolean is80211McRTTResponder = false; @@ -1492,8 +1492,8 @@ public class WifiNative { secondChanelOffset = bytes[inforStart + 1] & 0x3; } else if(type == EID_VHT_OPERATION) { channelMode = bytes[inforStart]; - centerFreqIndex1 = bytes[inforStart + 1]; - centerFreqIndex2 = bytes[inforStart + 2]; + centerFreqIndex1 = bytes[inforStart + 1] & 0xFF; + centerFreqIndex2 = bytes[inforStart + 2] & 0xFF; } else if (type == EID_EXTENDED_CAPS) { int tempIndex = RTT_RESP_ENABLE_BIT / 8; byte offset = RTT_RESP_ENABLE_BIT % 8; |