Merge "Add checks to verify that the Wifi HAL is initialized."

2 files changed, 9 insertions, 0 deletions

diff --git a/service/java/com/android/server/wifi/HalDeviceManager.java b/service/java/com/android/server/wifi/HalDeviceManager.java
index 73ffd2734b..919ecd19c8 100644
--- a/service/java/com/android/server/wifi/HalDeviceManager.java
+++ b/service/java/com/android/server/wifi/HalDeviceManager.java
@@ -801,6 +801,10 @@ public class HalDeviceManager {
 
         IfaceCreationData creationData;
         synchronized (mLock) {
+            if (!mWifiHal.isInitializationComplete()) {
+                Log.e(TAG, "reportImpactToCreateIface: Wifi Hal is not available");
+                return null;
+            }
             WifiChipInfo[] chipInfos = getAllChipInfo();
             if (chipInfos == null) {
                 Log.e(TAG, "createIface: no chip info found");
@@ -1373,6 +1377,10 @@ public class HalDeviceManager {
     private void stopWifi() {
         if (VDBG) Log.d(TAG, "stopWifi");
         synchronized (mLock) {
+            if (!mWifiHal.isInitializationComplete()) {
+                Log.w(TAG, "stopWifi was called, but Wifi Hal is not initialized");
+                return;
+            }
             if (!mWifiHal.stop()) {
                 Log.e(TAG, "Cannot stop IWifi");
             }
diff --git a/service/tests/wifitests/src/com/android/server/wifi/HalDeviceManagerTest.java b/service/tests/wifitests/src/com/android/server/wifi/HalDeviceManagerTest.java
index 48f3bdfef3..1b8750e746 100644
--- a/service/tests/wifitests/src/com/android/server/wifi/HalDeviceManagerTest.java
+++ b/service/tests/wifitests/src/com/android/server/wifi/HalDeviceManagerTest.java
@@ -182,6 +182,7 @@ public class HalDeviceManagerTest extends WifiBaseTest {
         when(mWifiMock.start()).thenReturn(WifiHal.WIFI_STATUS_SUCCESS);
         when(mWifiMock.stop()).thenReturn(true);
         when(mWifiMock.isStarted()).thenReturn(true);
+        when(mWifiMock.isInitializationComplete()).thenReturn(true);
         when(mContext.getResources()).thenReturn(mResources);
         when(mResources.getBoolean(R.bool.config_wifiBridgedSoftApSupported))
                 .thenReturn(mIsBridgedSoftApSupported);