diff options
author | Sunil Ravi <sunilravi@google.com> | 2019-10-25 14:27:49 -0700 |
---|---|---|
committer | Sunil Ravi <sunilravi@google.com> | 2019-10-29 17:50:08 +0000 |
commit | 62fd4095eaa52c2f7d5274a318dd0c8e2c2f1b1f (patch) | |
tree | aaae9b6ab68ec0f6d05fb66929ff73692198e61f /service | |
parent | 5147e660f665977a7262696d2936ff5595e143d2 (diff) |
Change WIFI_FEATURE_XXX type from int to long
This change is to avoid issues in assigning signed integer
feature (WIFI_FEATURE_DPP) to long featureSet. The
assignement was resulting in large, signed integer.
Bug: 143363031
Test: atest com.android.wifi.server
Test: Wifi ON/OFF, Connect and data transfer
Test: Added logs and verified feature set saved in iface.
Change-Id: I130351037cc87a2c333282b6ba2351f081c53bc0
(cherry picked from commit 18b0feceb73b1465635b0153e4cf88eb51ce4614)
Diffstat (limited to 'service')
-rw-r--r-- | service/java/com/android/server/wifi/SupplicantStaIfaceHal.java | 4 | ||||
-rw-r--r-- | service/java/com/android/server/wifi/WifiVendorHal.java | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/service/java/com/android/server/wifi/SupplicantStaIfaceHal.java b/service/java/com/android/server/wifi/SupplicantStaIfaceHal.java index 86518c761..8db7c90ee 100644 --- a/service/java/com/android/server/wifi/SupplicantStaIfaceHal.java +++ b/service/java/com/android/server/wifi/SupplicantStaIfaceHal.java @@ -3074,10 +3074,10 @@ public class SupplicantStaIfaceHal { * This is a v1.2+ HAL feature. * On error, or if these features are not supported, 0 is returned. */ - public int getAdvancedKeyMgmtCapabilities(@NonNull String ifaceName) { + public long getAdvancedKeyMgmtCapabilities(@NonNull String ifaceName) { final String methodStr = "getAdvancedKeyMgmtCapabilities"; - int advancedCapabilities = 0; + long advancedCapabilities = 0; int keyMgmtCapabilities = getKeyMgmtCapabilities(ifaceName); if ((keyMgmtCapabilities & android.hardware.wifi.supplicant.V1_2.ISupplicantStaNetwork diff --git a/service/java/com/android/server/wifi/WifiVendorHal.java b/service/java/com/android/server/wifi/WifiVendorHal.java index 464a34007..e780c10c4 100644 --- a/service/java/com/android/server/wifi/WifiVendorHal.java +++ b/service/java/com/android/server/wifi/WifiVendorHal.java @@ -1072,7 +1072,7 @@ public class WifiVendorHal { /** * Translation table used by getSupportedFeatureSet for translating IWifiChip caps for V1.1 */ - private static final int[][] sChipFeatureCapabilityTranslation = { + private static final long[][] sChipFeatureCapabilityTranslation = { {WifiManager.WIFI_FEATURE_TX_POWER_LIMIT, android.hardware.wifi.V1_1.IWifiChip.ChipCapabilityMask.SET_TX_POWER_LIMIT }, @@ -1139,7 +1139,7 @@ public class WifiVendorHal { /** * Translation table used by getSupportedFeatureSet for translating IWifiStaIface caps */ - private static final int[][] sStaFeatureCapabilityTranslation = { + private static final long[][] sStaFeatureCapabilityTranslation = { {WifiManager.WIFI_FEATURE_INFRA_5G, IWifiStaIface.StaIfaceCapabilityMask.STA_5G }, @@ -1188,8 +1188,8 @@ public class WifiVendorHal { * @return bitmask defined by WifiManager.WIFI_FEATURE_* */ @VisibleForTesting - int wifiFeatureMaskFromStaCapabilities(int capabilities) { - int features = 0; + long wifiFeatureMaskFromStaCapabilities(int capabilities) { + long features = 0; for (int i = 0; i < sStaFeatureCapabilityTranslation.length; i++) { if ((capabilities & sStaFeatureCapabilityTranslation[i][1]) != 0) { features |= sStaFeatureCapabilityTranslation[i][0]; |