diff options
| author | Roshan Pius <rpius@google.com> | 2017-02-27 14:47:29 -0800 |
|---|---|---|
| committer | Roshan Pius <rpius@google.com> | 2017-03-06 16:37:14 -0800 |
| commit | 3b7def108eeb23b7350038f2defc966ee23e9952 (patch) | |
| tree | 4a990ed620ecdcf66703d43eb502bead46fce28f | |
| parent | c7ddffabcd191c2bfd251b3d5d321e6e8f1d0bd3 (diff) | |
WifiNative: Turn on supplicant/vendor HIDL Interface
While there,
Fixed unit test failures in WifiNative.
Bug: 35765841
Bug: 35868540
Test: Verified via the wifi integration test suite.
Test: Verified the build for any power regressions.
Change-Id: I7daf7c35af5a5a284e2468b3451b7f87102997bd
| -rw-r--r-- | service/java/com/android/server/wifi/WifiNative.java | 4 | ||||
| -rw-r--r-- | tests/wifitests/src/com/android/server/wifi/WifiNativeTest.java | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/service/java/com/android/server/wifi/WifiNative.java b/service/java/com/android/server/wifi/WifiNative.java index 149e193a4..c5e5fc77e 100644 --- a/service/java/com/android/server/wifi/WifiNative.java +++ b/service/java/com/android/server/wifi/WifiNative.java @@ -136,8 +136,8 @@ public class WifiNative { // TODO(b/34884202): Set this to true to enable HIDL once we're fully ready. - private static final boolean HIDL_VENDOR_ENABLE = false; - public static final boolean HIDL_SUP_ENABLE = false; + private static final boolean HIDL_VENDOR_ENABLE = true; + public static final boolean HIDL_SUP_ENABLE = true; private static final boolean HIDL_P2P_ENABLE = false; private final String mTAG; private final String mInterfaceName; diff --git a/tests/wifitests/src/com/android/server/wifi/WifiNativeTest.java b/tests/wifitests/src/com/android/server/wifi/WifiNativeTest.java index e35028de0..ef33b656f 100644 --- a/tests/wifitests/src/com/android/server/wifi/WifiNativeTest.java +++ b/tests/wifitests/src/com/android/server/wifi/WifiNativeTest.java @@ -148,6 +148,7 @@ public class WifiNativeTest { }}; private WifiNative mWifiNative; + private WifiVendorHal mWifiVendorHal; @Before public void setUp() throws Exception { @@ -155,6 +156,8 @@ public class WifiNativeTest { WifiNative.class.getDeclaredConstructor(String.class, Boolean.TYPE); wifiNativeConstructor.setAccessible(true); mWifiNative = spy(wifiNativeConstructor.newInstance("test", true)); + mWifiVendorHal = mock(WifiVendorHal.class); + mWifiNative.setWifiVendorHal(mWifiVendorHal); } /** |