diff options
| author | Sunil Ravi <sunilravi@google.com> | 2019-10-30 10:37:20 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-10-30 10:37:20 -0700 |
| commit | ca2669f7ea167cee53adb891a3406d54f5685f9f (patch) | |
| tree | 7619b78f590669230443d4ac15444acfe69c93b3 /service | |
| parent | 0dc4b95d573a0cb142f6ad210ddbbbeecae7f3f9 (diff) | |
| parent | b41c60fe8151632f6e425ce6c1ed1ce8a9659328 (diff) | |
Merge "Change WIFI_FEATURE_XXX type from int to long" into qt-qpr1-dev
am: b41c60fe81
Change-Id: I4a76a22a5087104f51e6bb8634e5a7980a9c82ab
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]; |