From 62fd4095eaa52c2f7d5274a318dd0c8e2c2f1b1f Mon Sep 17 00:00:00 2001 From: Sunil Ravi Date: Fri, 25 Oct 2019 14:27:49 -0700 Subject: 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) --- .../wifitests/src/com/android/server/wifi/ClientModeImplTest.java | 8 ++++---- .../wifitests/src/com/android/server/wifi/WifiVendorHalTest.java | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) (limited to 'tests') diff --git a/tests/wifitests/src/com/android/server/wifi/ClientModeImplTest.java b/tests/wifitests/src/com/android/server/wifi/ClientModeImplTest.java index 36d8441c7..c3e31131d 100644 --- a/tests/wifitests/src/com/android/server/wifi/ClientModeImplTest.java +++ b/tests/wifitests/src/com/android/server/wifi/ClientModeImplTest.java @@ -1789,10 +1789,10 @@ public class ClientModeImplTest { /** Verifies that syncGetSupportedFeatures() masks out capabilities based on system flags. */ @Test public void syncGetSupportedFeatures() { - final int featureAware = WifiManager.WIFI_FEATURE_AWARE; - final int featureInfra = WifiManager.WIFI_FEATURE_INFRA; - final int featureD2dRtt = WifiManager.WIFI_FEATURE_D2D_RTT; - final int featureD2apRtt = WifiManager.WIFI_FEATURE_D2AP_RTT; + final long featureAware = WifiManager.WIFI_FEATURE_AWARE; + final long featureInfra = WifiManager.WIFI_FEATURE_INFRA; + final long featureD2dRtt = WifiManager.WIFI_FEATURE_D2D_RTT; + final long featureD2apRtt = WifiManager.WIFI_FEATURE_D2AP_RTT; final long featureLongBits = 0x1100000000L; assertEquals(0, testGetSupportedFeaturesCase(0, false)); diff --git a/tests/wifitests/src/com/android/server/wifi/WifiVendorHalTest.java b/tests/wifitests/src/com/android/server/wifi/WifiVendorHalTest.java index aa44023ae..c33a4d55e 100644 --- a/tests/wifitests/src/com/android/server/wifi/WifiVendorHalTest.java +++ b/tests/wifitests/src/com/android/server/wifi/WifiVendorHalTest.java @@ -730,7 +730,7 @@ public class WifiVendorHalTest { IWifiStaIface.StaIfaceCapabilityMask.BACKGROUND_SCAN | IWifiStaIface.StaIfaceCapabilityMask.LINK_LAYER_STATS ); - int expected = ( + long expected = ( WifiManager.WIFI_FEATURE_SCANNER | WifiManager.WIFI_FEATURE_LINK_LAYER_STATS); assertEquals(expected, mWifiVendorHal.wifiFeatureMaskFromStaCapabilities(caps)); @@ -749,7 +749,7 @@ public class WifiVendorHalTest { | android.hardware.wifi.V1_1.IWifiChip.ChipCapabilityMask.D2D_RTT | android.hardware.wifi.V1_1.IWifiChip.ChipCapabilityMask.D2AP_RTT ); - int expected = ( + long expected = ( WifiManager.WIFI_FEATURE_TX_POWER_LIMIT | WifiManager.WIFI_FEATURE_D2D_RTT | WifiManager.WIFI_FEATURE_D2AP_RTT @@ -768,7 +768,7 @@ public class WifiVendorHalTest { android.hardware.wifi.V1_3.IWifiChip.ChipCapabilityMask.SET_LATENCY_MODE | android.hardware.wifi.V1_1.IWifiChip.ChipCapabilityMask.D2D_RTT ); - int expected = ( + long expected = ( WifiManager.WIFI_FEATURE_LOW_LATENCY | WifiManager.WIFI_FEATURE_D2D_RTT ); @@ -794,7 +794,7 @@ public class WifiVendorHalTest { add(IfaceType.STA); add(IfaceType.P2P); }}; - int expectedFeatureSet = ( + long expectedFeatureSet = ( WifiManager.WIFI_FEATURE_SCANNER | WifiManager.WIFI_FEATURE_LINK_LAYER_STATS | WifiManager.WIFI_FEATURE_TX_POWER_LIMIT -- cgit v1.2.3