diff options
7 files changed, 103 insertions, 27 deletions
diff --git a/framework/api/current.txt b/framework/api/current.txt index b6c7c1feae..bc6265c499 100644 --- a/framework/api/current.txt +++ b/framework/api/current.txt @@ -354,6 +354,7 @@ package android.net.wifi { method @RequiresPermission(android.Manifest.permission.ACCESS_WIFI_STATE) public boolean isAutoWakeupEnabled(); method public boolean isBridgedApConcurrencySupported(); method @Deprecated public boolean isDeviceToApRttSupported(); + method public boolean isEasyConnectEnrolleeResponderModeSupported(); method public boolean isEasyConnectSupported(); method public boolean isEnhancedOpenSupported(); method public boolean isEnhancedPowerReportingSupported(); diff --git a/framework/java/android/net/wifi/WifiManager.java b/framework/java/android/net/wifi/WifiManager.java index 29f0c2da1a..007b58dffd 100644 --- a/framework/java/android/net/wifi/WifiManager.java +++ b/framework/java/android/net/wifi/WifiManager.java @@ -2610,6 +2610,12 @@ public class WifiManager { */ public static final long WIFI_FEATURE_ADDITIONAL_STA_RESTRICTED = 0x400000000000L; + /** + * DPP (Easy-Connect) Enrollee Responder mode support + * @hide + */ + public static final long WIFI_FEATURE_DPP_ENROLLEE_RESPONDER = 0x800000000000L; + private long getSupportedFeatures() { try { return mService.getSupportedFeatures(); @@ -6238,6 +6244,13 @@ public class WifiManager { } /** + * @return true if this device supports Wi-Fi Easy Connect (DPP) Enrollee Responder mode. + */ + public boolean isEasyConnectEnrolleeResponderModeSupported() { + return isFeatureSupported(WIFI_FEATURE_DPP_ENROLLEE_RESPONDER); + } + + /** * @return true if this device supports WAPI. */ public boolean isWapiSupported() { diff --git a/framework/tests/src/android/net/wifi/WifiManagerTest.java b/framework/tests/src/android/net/wifi/WifiManagerTest.java index d3ee0526dd..e8e72727a8 100644 --- a/framework/tests/src/android/net/wifi/WifiManagerTest.java +++ b/framework/tests/src/android/net/wifi/WifiManagerTest.java @@ -41,6 +41,7 @@ import static android.net.wifi.WifiManager.WIFI_FEATURE_ADDITIONAL_STA_MBB; import static android.net.wifi.WifiManager.WIFI_FEATURE_ADDITIONAL_STA_RESTRICTED; import static android.net.wifi.WifiManager.WIFI_FEATURE_AP_STA; import static android.net.wifi.WifiManager.WIFI_FEATURE_DPP; +import static android.net.wifi.WifiManager.WIFI_FEATURE_DPP_ENROLLEE_RESPONDER; import static android.net.wifi.WifiManager.WIFI_FEATURE_OWE; import static android.net.wifi.WifiManager.WIFI_FEATURE_P2P; import static android.net.wifi.WifiManager.WIFI_FEATURE_PASSPOINT; @@ -2216,6 +2217,21 @@ public class WifiManagerTest { } /** + * Test behavior of isEasyConnectEnrolleeResponderModeSupported + */ + @Test + public void testIsEasyConnectEnrolleeResponderModeSupported() throws Exception { + assumeTrue(SdkLevel.isAtLeastS()); + + when(mWifiService.getSupportedFeatures()) + .thenReturn(new Long(WIFI_FEATURE_DPP_ENROLLEE_RESPONDER)); + assertTrue(mWifiManager.isEasyConnectEnrolleeResponderModeSupported()); + when(mWifiService.getSupportedFeatures()) + .thenReturn(new Long(~WIFI_FEATURE_DPP_ENROLLEE_RESPONDER)); + assertFalse(mWifiManager.isEasyConnectEnrolleeResponderModeSupported()); + } + + /** * Test behavior of isStaApConcurrencySupported */ @Test diff --git a/service/java/com/android/server/wifi/SupplicantStaIfaceHal.java b/service/java/com/android/server/wifi/SupplicantStaIfaceHal.java index c6ea668015..0aaf7b2063 100644 --- a/service/java/com/android/server/wifi/SupplicantStaIfaceHal.java +++ b/service/java/com/android/server/wifi/SupplicantStaIfaceHal.java @@ -16,6 +16,7 @@ package com.android.server.wifi; import static android.net.wifi.WifiManager.WIFI_FEATURE_DPP; +import static android.net.wifi.WifiManager.WIFI_FEATURE_DPP_ENROLLEE_RESPONDER; import static android.net.wifi.WifiManager.WIFI_FEATURE_FILS_SHA256; import static android.net.wifi.WifiManager.WIFI_FEATURE_FILS_SHA384; import static android.net.wifi.WifiManager.WIFI_FEATURE_MBO; @@ -1372,7 +1373,7 @@ public class SupplicantStaIfaceHal { synchronized (mLock) { SupplicantStaNetworkHal network = new SupplicantStaNetworkHal(iSupplicantStaNetwork, ifaceName, mContext, - mWifiMonitor, mWifiGlobals, getAdvancedKeyMgmtCapabilities(ifaceName)); + mWifiMonitor, mWifiGlobals, getAdvancedCapabilities(ifaceName)); if (network != null) { network.enableVerboseLogging(mVerboseLoggingEnabled); } @@ -2890,7 +2891,7 @@ public class SupplicantStaIfaceHal { } /** - * Returns a bitmask of advanced key management capabilities: WPA3 SAE/SUITE B and OWE + * Returns a bitmask of advanced capabilities: WPA3 SAE/SUITE B and OWE * Bitmask used is: * - WIFI_FEATURE_WPA3_SAE * - WIFI_FEATURE_WPA3_SUITE_B @@ -2899,8 +2900,8 @@ public class SupplicantStaIfaceHal { * This is a v1.2+ HAL feature. * On error, or if these features are not supported, 0 is returned. */ - public long getAdvancedKeyMgmtCapabilities(@NonNull String ifaceName) { - final String methodStr = "getAdvancedKeyMgmtCapabilities"; + public long getAdvancedCapabilities(@NonNull String ifaceName) { + final String methodStr = "getAdvancedCapabilities"; long advancedCapabilities = 0; int keyMgmtCapabilities = getKeyMgmtCapabilities(ifaceName); @@ -2939,6 +2940,12 @@ public class SupplicantStaIfaceHal { if (mVerboseLoggingEnabled) { Log.v(TAG, methodStr + ": DPP supported"); } + if (isV1_4()) { + advancedCapabilities |= WIFI_FEATURE_DPP_ENROLLEE_RESPONDER; + if (mVerboseLoggingEnabled) { + Log.v(TAG, methodStr + ": DPP ENROLLEE RESPONDER supported"); + } + } } if ((keyMgmtCapabilities & android.hardware.wifi.supplicant.V1_3.ISupplicantStaNetwork diff --git a/service/java/com/android/server/wifi/WifiNative.java b/service/java/com/android/server/wifi/WifiNative.java index 21d9a61ad1..0ae48a2614 100644 --- a/service/java/com/android/server/wifi/WifiNative.java +++ b/service/java/com/android/server/wifi/WifiNative.java @@ -3151,7 +3151,7 @@ public class WifiNative { * @return bitmask defined by WifiManager.WIFI_FEATURE_* */ private long getSupportedFeatureSetInternal(@NonNull String ifaceName) { - return mSupplicantStaIfaceHal.getAdvancedKeyMgmtCapabilities(ifaceName) + return mSupplicantStaIfaceHal.getAdvancedCapabilities(ifaceName) | mWifiVendorHal.getSupportedFeatureSet(ifaceName) | mSupplicantStaIfaceHal.getWpaDriverFeatureSet(ifaceName); } diff --git a/service/tests/wifitests/src/com/android/server/wifi/SupplicantStaIfaceHalTest.java b/service/tests/wifitests/src/com/android/server/wifi/SupplicantStaIfaceHalTest.java index 61d9fa4f08..7496f769be 100644 --- a/service/tests/wifitests/src/com/android/server/wifi/SupplicantStaIfaceHalTest.java +++ b/service/tests/wifitests/src/com/android/server/wifi/SupplicantStaIfaceHalTest.java @@ -16,6 +16,7 @@ package com.android.server.wifi; import static android.net.wifi.WifiManager.WIFI_FEATURE_DPP; +import static android.net.wifi.WifiManager.WIFI_FEATURE_DPP_ENROLLEE_RESPONDER; import static android.net.wifi.WifiManager.WIFI_FEATURE_FILS_SHA256; import static android.net.wifi.WifiManager.WIFI_FEATURE_FILS_SHA384; import static android.net.wifi.WifiManager.WIFI_FEATURE_MBO; @@ -1790,7 +1791,7 @@ public class SupplicantStaIfaceHalTest extends WifiBaseTest { } /** - * Test get key management capabilities API on old HAL, should return 0 (not supported) + * Test get advanced capabilities API on old HAL, should return 0 (not supported) */ @Test public void testGetKeyMgmtCapabilitiesOldHal() throws Exception { @@ -1798,7 +1799,7 @@ public class SupplicantStaIfaceHalTest extends WifiBaseTest { executeAndValidateInitializationSequenceV1_1(false, false); - assertTrue(mDut.getAdvancedKeyMgmtCapabilities(WLAN0_IFACE_NAME) == 0); + assertTrue(mDut.getAdvancedCapabilities(WLAN0_IFACE_NAME) == 0); } /** @@ -1816,7 +1817,7 @@ public class SupplicantStaIfaceHalTest extends WifiBaseTest { android.hardware.wifi.supplicant.V1_2.ISupplicantStaIface .getKeyMgmtCapabilitiesCallback.class)); - assertEquals(WIFI_FEATURE_WPA3_SAE, mDut.getAdvancedKeyMgmtCapabilities(WLAN0_IFACE_NAME)); + assertEquals(WIFI_FEATURE_WPA3_SAE, mDut.getAdvancedCapabilities(WLAN0_IFACE_NAME)); } /** @@ -1835,7 +1836,7 @@ public class SupplicantStaIfaceHalTest extends WifiBaseTest { .getKeyMgmtCapabilitiesCallback.class)); assertEquals(WIFI_FEATURE_WPA3_SUITE_B, - mDut.getAdvancedKeyMgmtCapabilities(WLAN0_IFACE_NAME)); + mDut.getAdvancedCapabilities(WLAN0_IFACE_NAME)); } /** @@ -1853,7 +1854,7 @@ public class SupplicantStaIfaceHalTest extends WifiBaseTest { android.hardware.wifi.supplicant.V1_2.ISupplicantStaIface .getKeyMgmtCapabilitiesCallback.class)); - assertEquals(WIFI_FEATURE_OWE, mDut.getAdvancedKeyMgmtCapabilities(WLAN0_IFACE_NAME)); + assertEquals(WIFI_FEATURE_OWE, mDut.getAdvancedCapabilities(WLAN0_IFACE_NAME)); } /** @@ -1873,7 +1874,7 @@ public class SupplicantStaIfaceHalTest extends WifiBaseTest { .getKeyMgmtCapabilitiesCallback.class)); assertEquals(WIFI_FEATURE_OWE | WIFI_FEATURE_WPA3_SAE, - mDut.getAdvancedKeyMgmtCapabilities(WLAN0_IFACE_NAME)); + mDut.getAdvancedCapabilities(WLAN0_IFACE_NAME)); } /** @@ -1891,7 +1892,45 @@ public class SupplicantStaIfaceHalTest extends WifiBaseTest { android.hardware.wifi.supplicant.V1_2.ISupplicantStaIface .getKeyMgmtCapabilitiesCallback.class)); - assertEquals(WIFI_FEATURE_DPP, mDut.getAdvancedKeyMgmtCapabilities(WLAN0_IFACE_NAME)); + assertEquals(WIFI_FEATURE_DPP, mDut.getAdvancedCapabilities(WLAN0_IFACE_NAME)); + } + + /** + * Test Easy Connect (DPP) Enrollee Responder mode supported on supplicant HAL V1_4 + */ + @Test + public void testGetDppEnrolleeResponderModeSupport() throws Exception { + setupMocksForHalV1_4(); + executeAndValidateInitializationSequenceV1_4(); + + doAnswer(new GetKeyMgmtCapabilities_1_3Answer(android.hardware.wifi.supplicant.V1_2 + .ISupplicantStaNetwork.KeyMgmtMask.DPP)) + .when(mISupplicantStaIfaceMockV13).getKeyMgmtCapabilities_1_3(any( + android.hardware.wifi.supplicant.V1_3.ISupplicantStaIface + .getKeyMgmtCapabilities_1_3Callback.class)); + + assertEquals(WIFI_FEATURE_DPP | WIFI_FEATURE_DPP_ENROLLEE_RESPONDER, + mDut.getAdvancedCapabilities(WLAN0_IFACE_NAME)); + } + + /** + * Test Easy Connect (DPP) Enrollee Responder mode is not supported on supplicant HAL + * V1_3 or less. + */ + @Test + public void testDppEnrolleeResponderModeNotSupportedOnHalV1_3OrLess() throws Exception { + setupMocksForHalV1_3(); + executeAndValidateInitializationSequenceV1_3(); + + doAnswer(new GetKeyMgmtCapabilities_1_3Answer(android.hardware.wifi.supplicant.V1_2 + .ISupplicantStaNetwork.KeyMgmtMask.DPP)) + .when(mISupplicantStaIfaceMockV13).getKeyMgmtCapabilities_1_3(any( + android.hardware.wifi.supplicant.V1_3.ISupplicantStaIface + .getKeyMgmtCapabilities_1_3Callback.class)); + + assertFalse((WIFI_FEATURE_DPP_ENROLLEE_RESPONDER + & mDut.getAdvancedCapabilities(WLAN0_IFACE_NAME)) + == WIFI_FEATURE_DPP_ENROLLEE_RESPONDER); } /** @@ -1909,7 +1948,7 @@ public class SupplicantStaIfaceHalTest extends WifiBaseTest { android.hardware.wifi.supplicant.V1_3.ISupplicantStaIface .getKeyMgmtCapabilities_1_3Callback.class)); - assertEquals(WIFI_FEATURE_WAPI, mDut.getAdvancedKeyMgmtCapabilities(WLAN0_IFACE_NAME)); + assertEquals(WIFI_FEATURE_WAPI, mDut.getAdvancedCapabilities(WLAN0_IFACE_NAME)); } /** @@ -1928,7 +1967,7 @@ public class SupplicantStaIfaceHalTest extends WifiBaseTest { .getKeyMgmtCapabilities_1_3Callback.class)); assertEquals(WIFI_FEATURE_FILS_SHA256, - mDut.getAdvancedKeyMgmtCapabilities(WLAN0_IFACE_NAME)); + mDut.getAdvancedCapabilities(WLAN0_IFACE_NAME)); } /** @@ -1947,7 +1986,7 @@ public class SupplicantStaIfaceHalTest extends WifiBaseTest { .getKeyMgmtCapabilities_1_3Callback.class)); assertEquals(WIFI_FEATURE_FILS_SHA384, - mDut.getAdvancedKeyMgmtCapabilities(WLAN0_IFACE_NAME)); + mDut.getAdvancedCapabilities(WLAN0_IFACE_NAME)); } /** diff --git a/service/tests/wifitests/src/com/android/server/wifi/WifiNativeInterfaceManagementTest.java b/service/tests/wifitests/src/com/android/server/wifi/WifiNativeInterfaceManagementTest.java index 63a7004e48..374182e753 100644 --- a/service/tests/wifitests/src/com/android/server/wifi/WifiNativeInterfaceManagementTest.java +++ b/service/tests/wifitests/src/com/android/server/wifi/WifiNativeInterfaceManagementTest.java @@ -470,7 +470,7 @@ public class WifiNativeInterfaceManagementTest extends WifiBaseTest { mInOrder.verify(mWificondControl).setupInterfaceForSoftApMode(IFACE_NAME_0); mInOrder.verify(mNetdWrapper).registerObserver(mNetworkObserverCaptor1.capture()); mInOrder.verify(mNetdWrapper).isInterfaceUp(IFACE_NAME_0); - mInOrder.verify(mSupplicantStaIfaceHal).getAdvancedKeyMgmtCapabilities(IFACE_NAME_0); + mInOrder.verify(mSupplicantStaIfaceHal).getAdvancedCapabilities(IFACE_NAME_0); mInOrder.verify(mWifiVendorHal).getSupportedFeatureSet(IFACE_NAME_0); mInOrder.verify(mSupplicantStaIfaceHal).getWpaDriverFeatureSet(IFACE_NAME_0); @@ -524,7 +524,7 @@ public class WifiNativeInterfaceManagementTest extends WifiBaseTest { mInOrder.verify(mNetdWrapper).clearInterfaceAddresses(IFACE_NAME_0); mInOrder.verify(mNetdWrapper).setInterfaceIpv6PrivacyExtensions(IFACE_NAME_0, true); mInOrder.verify(mNetdWrapper).disableIpv6(IFACE_NAME_0); - mInOrder.verify(mSupplicantStaIfaceHal).getAdvancedKeyMgmtCapabilities(IFACE_NAME_0); + mInOrder.verify(mSupplicantStaIfaceHal).getAdvancedCapabilities(IFACE_NAME_0); mInOrder.verify(mWifiVendorHal).getSupportedFeatureSet(IFACE_NAME_0); mInOrder.verify(mSupplicantStaIfaceHal).getWpaDriverFeatureSet(IFACE_NAME_0); @@ -740,7 +740,7 @@ public class WifiNativeInterfaceManagementTest extends WifiBaseTest { mInOrder.verify(mWificondControl).setupInterfaceForSoftApMode(IFACE_NAME_0); mInOrder.verify(mNetdWrapper).registerObserver(mNetworkObserverCaptor1.capture()); mInOrder.verify(mNetdWrapper).isInterfaceUp(IFACE_NAME_0); - mInOrder.verify(mSupplicantStaIfaceHal).getAdvancedKeyMgmtCapabilities(IFACE_NAME_0); + mInOrder.verify(mSupplicantStaIfaceHal).getAdvancedCapabilities(IFACE_NAME_0); mInOrder.verify(mWifiVendorHal).getSupportedFeatureSet(IFACE_NAME_0); mInOrder.verify(mSupplicantStaIfaceHal).getWpaDriverFeatureSet(IFACE_NAME_0); @@ -1226,7 +1226,7 @@ public class WifiNativeInterfaceManagementTest extends WifiBaseTest { mInOrder.verify(mNetdWrapper).clearInterfaceAddresses(IFACE_NAME_0); mInOrder.verify(mNetdWrapper).setInterfaceIpv6PrivacyExtensions(IFACE_NAME_0, true); mInOrder.verify(mNetdWrapper).disableIpv6(IFACE_NAME_0); - mInOrder.verify(mSupplicantStaIfaceHal).getAdvancedKeyMgmtCapabilities(IFACE_NAME_0); + mInOrder.verify(mSupplicantStaIfaceHal).getAdvancedCapabilities(IFACE_NAME_0); mInOrder.verify(mWifiVendorHal).getSupportedFeatureSet(IFACE_NAME_0); mInOrder.verify(mSupplicantStaIfaceHal).getWpaDriverFeatureSet(IFACE_NAME_0); @@ -1255,7 +1255,7 @@ public class WifiNativeInterfaceManagementTest extends WifiBaseTest { mInOrder.verify(mWificondControl).setupInterfaceForSoftApMode(IFACE_NAME_0); mInOrder.verify(mNetdWrapper).registerObserver(mNetworkObserverCaptor1.capture()); mInOrder.verify(mNetdWrapper).isInterfaceUp(IFACE_NAME_0); - mInOrder.verify(mSupplicantStaIfaceHal).getAdvancedKeyMgmtCapabilities(IFACE_NAME_0); + mInOrder.verify(mSupplicantStaIfaceHal).getAdvancedCapabilities(IFACE_NAME_0); mInOrder.verify(mWifiVendorHal).getSupportedFeatureSet(IFACE_NAME_0); mInOrder.verify(mSupplicantStaIfaceHal).getWpaDriverFeatureSet(IFACE_NAME_0); } @@ -1286,7 +1286,7 @@ public class WifiNativeInterfaceManagementTest extends WifiBaseTest { mInOrder.verify(mWificondControl).setupInterfaceForSoftApMode(IFACE_NAME_0); mInOrder.verify(mNetdWrapper).registerObserver(mNetworkObserverCaptor0.capture()); mInOrder.verify(mNetdWrapper).isInterfaceUp(IFACE_NAME_0); - mInOrder.verify(mSupplicantStaIfaceHal).getAdvancedKeyMgmtCapabilities(IFACE_NAME_0); + mInOrder.verify(mSupplicantStaIfaceHal).getAdvancedCapabilities(IFACE_NAME_0); mInOrder.verify(mWifiVendorHal).getSupportedFeatureSet(IFACE_NAME_0); mInOrder.verify(mSupplicantStaIfaceHal).getWpaDriverFeatureSet(IFACE_NAME_0); @@ -1320,7 +1320,7 @@ public class WifiNativeInterfaceManagementTest extends WifiBaseTest { mInOrder.verify(mNetdWrapper).clearInterfaceAddresses(IFACE_NAME_0); mInOrder.verify(mNetdWrapper).setInterfaceIpv6PrivacyExtensions(IFACE_NAME_0, true); mInOrder.verify(mNetdWrapper).disableIpv6(IFACE_NAME_0); - mInOrder.verify(mSupplicantStaIfaceHal).getAdvancedKeyMgmtCapabilities(IFACE_NAME_0); + mInOrder.verify(mSupplicantStaIfaceHal).getAdvancedCapabilities(IFACE_NAME_0); mInOrder.verify(mWifiVendorHal).getSupportedFeatureSet(IFACE_NAME_0); mInOrder.verify(mSupplicantStaIfaceHal).getWpaDriverFeatureSet(IFACE_NAME_0); } @@ -1361,7 +1361,7 @@ public class WifiNativeInterfaceManagementTest extends WifiBaseTest { mInOrder.verify(mSupplicantStaIfaceHal).teardownIface(IFACE_NAME_0); mInOrder.verify(mSupplicantStaIfaceHal).deregisterDeathHandler(); mInOrder.verify(mSupplicantStaIfaceHal).terminate(); - mInOrder.verify(mSupplicantStaIfaceHal).getAdvancedKeyMgmtCapabilities(IFACE_NAME_0); + mInOrder.verify(mSupplicantStaIfaceHal).getAdvancedCapabilities(IFACE_NAME_0); mInOrder.verify(mWifiVendorHal).getSupportedFeatureSet(IFACE_NAME_0); mInOrder.verify(mSupplicantStaIfaceHal).getWpaDriverFeatureSet(IFACE_NAME_0); } @@ -1396,7 +1396,7 @@ public class WifiNativeInterfaceManagementTest extends WifiBaseTest { mInOrder.verify(mSupplicantStaIfaceHal).isInitializationComplete(); mInOrder.verify(mSupplicantStaIfaceHal).registerDeathHandler(any()); mInOrder.verify(mSupplicantStaIfaceHal).setupIface(IFACE_NAME_0); - mInOrder.verify(mSupplicantStaIfaceHal).getAdvancedKeyMgmtCapabilities(IFACE_NAME_0); + mInOrder.verify(mSupplicantStaIfaceHal).getAdvancedCapabilities(IFACE_NAME_0); mInOrder.verify(mWifiVendorHal).getSupportedFeatureSet(IFACE_NAME_0); mInOrder.verify(mSupplicantStaIfaceHal).getWpaDriverFeatureSet(IFACE_NAME_0); } @@ -1474,7 +1474,7 @@ public class WifiNativeInterfaceManagementTest extends WifiBaseTest { mInOrder.verify(mNetdWrapper).clearInterfaceAddresses(ifaceName); mInOrder.verify(mNetdWrapper).setInterfaceIpv6PrivacyExtensions(ifaceName, true); mInOrder.verify(mNetdWrapper).disableIpv6(ifaceName); - mInOrder.verify(mSupplicantStaIfaceHal).getAdvancedKeyMgmtCapabilities(ifaceName); + mInOrder.verify(mSupplicantStaIfaceHal).getAdvancedCapabilities(ifaceName); mInOrder.verify(mWifiVendorHal).getSupportedFeatureSet(ifaceName); mInOrder.verify(mSupplicantStaIfaceHal).getWpaDriverFeatureSet(ifaceName); } @@ -1553,7 +1553,7 @@ public class WifiNativeInterfaceManagementTest extends WifiBaseTest { mInOrder.verify(mNetdWrapper).registerObserver(networkObserverCaptor.capture()); mInOrder.verify(mWifiMonitor).startMonitoring(ifaceName); mInOrder.verify(mNetdWrapper).isInterfaceUp(ifaceName); - mInOrder.verify(mSupplicantStaIfaceHal).getAdvancedKeyMgmtCapabilities(ifaceName); + mInOrder.verify(mSupplicantStaIfaceHal).getAdvancedCapabilities(ifaceName); mInOrder.verify(mWifiVendorHal).getSupportedFeatureSet(ifaceName); mInOrder.verify(mSupplicantStaIfaceHal).getWpaDriverFeatureSet(ifaceName); } @@ -1651,7 +1651,7 @@ public class WifiNativeInterfaceManagementTest extends WifiBaseTest { } mInOrder.verify(mNetdWrapper).registerObserver(networkObserverCaptor.capture()); mInOrder.verify(mNetdWrapper).isInterfaceUp(ifaceName); - mInOrder.verify(mSupplicantStaIfaceHal).getAdvancedKeyMgmtCapabilities(ifaceName); + mInOrder.verify(mSupplicantStaIfaceHal).getAdvancedCapabilities(ifaceName); mInOrder.verify(mWifiVendorHal).getSupportedFeatureSet(ifaceName); mInOrder.verify(mSupplicantStaIfaceHal).getWpaDriverFeatureSet(ifaceName); } |