diff options
| author | Pankaj Kanwar <pkanwar@google.com> | 2015-10-15 01:50:56 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-10-15 01:50:56 +0000 |
| commit | 12a1007dc04897e000f91ae43f9ca90cd7441f9d (patch) | |
| tree | c7cd45fb62ba462b72cf1b3598370d099267634b | |
| parent | d3ae426c1b298f038b34171d13d710524779074e (diff) | |
| parent | ac1f408138f092fe2a41cb5898163e05979c1cdd (diff) | |
| download | wifi-12a1007dc04897e000f91ae43f9ca90cd7441f9d.tar.gz | |
Merge "Fix center frequency parsing bug." into mnc-dr-dev
| -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; |