diff options
| author | Hai Shalom <haishalom@google.com> | 2018-12-12 12:29:42 -0800 |
|---|---|---|
| committer | Hai Shalom <haishalom@google.com> | 2018-12-13 00:07:13 +0000 |
| commit | bd74373d0c1c0a406a899641ebe848a7bd4d3c7e (patch) | |
| tree | 3b842715009ae947c0334d8ab2cf269a35279df5 /tests/wifitests/src/com/android/server/wifi/SupplicantStaIfaceHalTest.java | |
| parent | 59cef54d6c92e6875fccab69fddbffdf15f945f4 (diff) | |
| download | android_frameworks_opt_net_wifi-bd74373d0c1c0a406a899641ebe848a7bd4d3c7e.tar.gz android_frameworks_opt_net_wifi-bd74373d0c1c0a406a899641ebe848a7bd4d3c7e.tar.bz2 android_frameworks_opt_net_wifi-bd74373d0c1c0a406a899641ebe848a7bd4d3c7e.zip | |
Supplicant HAL: Fix Wi-Fi connection failure on sgi build
Fix Wi-Fi connection failure on sgi build with 1.1 and 1.0 HALs. The fix
included reverting changes of imports of 1.2 HAL back to 1.0 HAL, and
using an explicit 1.2 reference for new types and functions.
Bug: 120111972
Test: atest com.android.server.wifi (FrameworksWifiTests: Passed: 2989, Failed: 0 )
Change-Id: Id873828136a304f276307fb8e5b9b30beeb7e3f7
Diffstat (limited to 'tests/wifitests/src/com/android/server/wifi/SupplicantStaIfaceHalTest.java')
| -rw-r--r-- | tests/wifitests/src/com/android/server/wifi/SupplicantStaIfaceHalTest.java | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/tests/wifitests/src/com/android/server/wifi/SupplicantStaIfaceHalTest.java b/tests/wifitests/src/com/android/server/wifi/SupplicantStaIfaceHalTest.java index a7b143382..d73b88d87 100644 --- a/tests/wifitests/src/com/android/server/wifi/SupplicantStaIfaceHalTest.java +++ b/tests/wifitests/src/com/android/server/wifi/SupplicantStaIfaceHalTest.java @@ -50,11 +50,11 @@ import android.hardware.wifi.supplicant.V1_0.ISupplicantIface; import android.hardware.wifi.supplicant.V1_0.ISupplicantStaIface; import android.hardware.wifi.supplicant.V1_0.ISupplicantStaIfaceCallback; import android.hardware.wifi.supplicant.V1_0.ISupplicantStaIfaceCallback.BssidChangeReason; +import android.hardware.wifi.supplicant.V1_0.ISupplicantStaNetwork; import android.hardware.wifi.supplicant.V1_0.IfaceType; import android.hardware.wifi.supplicant.V1_0.SupplicantStatus; import android.hardware.wifi.supplicant.V1_0.SupplicantStatusCode; import android.hardware.wifi.supplicant.V1_0.WpsConfigMethods; -import android.hardware.wifi.supplicant.V1_2.ISupplicantStaNetwork; import android.hidl.manager.V1_0.IServiceManager; import android.hidl.manager.V1_0.IServiceNotification; import android.net.IpConfiguration; @@ -1723,7 +1723,8 @@ public class SupplicantStaIfaceHalTest { executeAndValidateInitializationSequenceV1_2(); - doAnswer(new GetKeyMgmtCapabilitiesAnswer(ISupplicantStaNetwork.KeyMgmtMask.SAE)) + doAnswer(new GetKeyMgmtCapabilitiesAnswer(android.hardware.wifi.supplicant.V1_2 + .ISupplicantStaNetwork.KeyMgmtMask.SAE)) .when(mISupplicantStaIfaceMockV1_2).getKeyMgmtCapabilities(any( android.hardware.wifi.supplicant.V1_2.ISupplicantStaIface .getKeyMgmtCapabilitiesCallback.class)); @@ -1747,7 +1748,8 @@ public class SupplicantStaIfaceHalTest { executeAndValidateInitializationSequenceV1_2(); - doAnswer(new GetKeyMgmtCapabilitiesAnswer(ISupplicantStaNetwork.KeyMgmtMask.SUITE_B_192)) + doAnswer(new GetKeyMgmtCapabilitiesAnswer(android.hardware.wifi.supplicant.V1_2 + .ISupplicantStaNetwork.KeyMgmtMask.SUITE_B_192)) .when(mISupplicantStaIfaceMockV1_2).getKeyMgmtCapabilities(any( android.hardware.wifi.supplicant.V1_2.ISupplicantStaIface .getKeyMgmtCapabilitiesCallback.class)); @@ -1772,7 +1774,8 @@ public class SupplicantStaIfaceHalTest { executeAndValidateInitializationSequenceV1_2(); - doAnswer(new GetKeyMgmtCapabilitiesAnswer(ISupplicantStaNetwork.KeyMgmtMask.OWE)) + doAnswer(new GetKeyMgmtCapabilitiesAnswer(android.hardware.wifi.supplicant.V1_2 + .ISupplicantStaNetwork.KeyMgmtMask.OWE)) .when(mISupplicantStaIfaceMockV1_2).getKeyMgmtCapabilities(any( android.hardware.wifi.supplicant.V1_2.ISupplicantStaIface .getKeyMgmtCapabilitiesCallback.class)); @@ -1796,8 +1799,9 @@ public class SupplicantStaIfaceHalTest { executeAndValidateInitializationSequenceV1_2(); - doAnswer(new GetKeyMgmtCapabilitiesAnswer(ISupplicantStaNetwork.KeyMgmtMask.OWE - | ISupplicantStaNetwork.KeyMgmtMask.SAE)) + doAnswer(new GetKeyMgmtCapabilitiesAnswer(android.hardware.wifi.supplicant.V1_2 + .ISupplicantStaNetwork.KeyMgmtMask.OWE + | android.hardware.wifi.supplicant.V1_2.ISupplicantStaNetwork.KeyMgmtMask.SAE)) .when(mISupplicantStaIfaceMockV1_2).getKeyMgmtCapabilities(any( android.hardware.wifi.supplicant.V1_2.ISupplicantStaIface .getKeyMgmtCapabilitiesCallback.class)); |