HalDeviceManager: Track isReady() correctly

With ag/6150830 in, mWifi == null no longer means that the HAL service is
no longer running. Add a new boolean to explicitly track this. The flag
is set whenever we retrieve mWifi, but it will be reset only when the
HAL service's death notification is received.

Also, removed some redundant mocking of isReady() API in aware unit tests.

Bug: 124756389
Test: ./frameworks/opt/net/wifi/tests/wifitests/runtests.sh
Test: Manually verified toggling wifi/softap on/off multiple times.
Change-Id: I80b707f4d3e31364a511b56d76ea6df05b984c53

1 files changed, 3 insertions, 1 deletions

diff --git a/tests/wifitests/src/com/android/server/wifi/WifiVendorHalTest.java b/tests/wifitests/src/com/android/server/wifi/WifiVendorHalTest.java
index d05d79772..c007ecefd 100644
--- a/tests/wifitests/src/com/android/server/wifi/WifiVendorHalTest.java
+++ b/tests/wifitests/src/com/android/server/wifi/WifiVendorHalTest.java
@@ -86,6 +86,7 @@ import android.net.wifi.ScanResult;
 import android.net.wifi.WifiManager;
 import android.net.wifi.WifiScanner;
 import android.net.wifi.WifiSsid;
+import android.os.Handler;
 import android.os.Looper;
 import android.os.RemoteException;
 import android.os.test.TestLooper;
@@ -367,7 +368,8 @@ public class WifiVendorHalTest {
         mWifiVendorHal.initialize(mVendorHalDeathHandler);
         ArgumentCaptor<WifiVendorHal.HalDeviceManagerStatusListener> hdmCallbackCaptor =
                 ArgumentCaptor.forClass(WifiVendorHal.HalDeviceManagerStatusListener.class);
-        verify(mHalDeviceManager).registerStatusListener(hdmCallbackCaptor.capture(), eq(null));
+        verify(mHalDeviceManager).registerStatusListener(
+                hdmCallbackCaptor.capture(), any(Handler.class));
         mHalDeviceManagerStatusCallbacks = hdmCallbackCaptor.getValue();
 
     }