diff options
| author | Sunil Ravi <sunilravi@google.com> | 2019-10-28 18:03:19 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-10-28 18:03:19 +0000 |
| commit | f1446a8dd1617a81df6dcf7398cd4cf242b8711b (patch) | |
| tree | 00cc292818c0075442effd99729e115192c9014d /tests | |
| parent | 36efc76276cd2a66a61ac36f41c9c75c5b7ad907 (diff) | |
| parent | 18b0feceb73b1465635b0153e4cf88eb51ce4614 (diff) | |
Merge "Change WIFI_FEATURE_XXX type from int to long"
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/wifitests/src/com/android/server/wifi/ClientModeImplTest.java | 8 | ||||
| -rw-r--r-- | tests/wifitests/src/com/android/server/wifi/WifiVendorHalTest.java | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/tests/wifitests/src/com/android/server/wifi/ClientModeImplTest.java b/tests/wifitests/src/com/android/server/wifi/ClientModeImplTest.java index da574b493..61d6c27df 100644 --- a/tests/wifitests/src/com/android/server/wifi/ClientModeImplTest.java +++ b/tests/wifitests/src/com/android/server/wifi/ClientModeImplTest.java @@ -1840,10 +1840,10 @@ public class ClientModeImplTest extends WifiBaseTest { /** 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 fc0cdd63b..561902e86 100644 --- a/tests/wifitests/src/com/android/server/wifi/WifiVendorHalTest.java +++ b/tests/wifitests/src/com/android/server/wifi/WifiVendorHalTest.java @@ -732,7 +732,7 @@ public class WifiVendorHalTest extends WifiBaseTest { 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)); @@ -751,7 +751,7 @@ public class WifiVendorHalTest extends WifiBaseTest { | 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 @@ -770,7 +770,7 @@ public class WifiVendorHalTest extends WifiBaseTest { 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 ); @@ -796,7 +796,7 @@ public class WifiVendorHalTest extends WifiBaseTest { 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 |