Add HalDeviceManager to WifiInjector

Need to share a singleton HalDeviceManager.

Bug: 34474043
Test: builds
Change-Id: I264ec83412938537c051f3fe16d340a1626cd8f1

1 files changed, 13 insertions, 0 deletions

diff --git a/service/java/com/android/server/wifi/WifiInjector.java b/service/java/com/android/server/wifi/WifiInjector.java
index 637da634d..ddbbd2745 100644
--- a/service/java/com/android/server/wifi/WifiInjector.java
+++ b/service/java/com/android/server/wifi/WifiInjector.java
@@ -103,6 +103,7 @@ public class WifiInjector {
     private final PasspointManager mPasspointManager;
     private final SIMAccessor mSimAccessor;
     private HandlerThread mWifiAwareHandlerThread;
+    private HalDeviceManager mHalDeviceManager;
 
     private final boolean mUseRealLogger;
 
@@ -412,4 +413,16 @@ public class WifiInjector {
         }
         return mWifiAwareHandlerThread;
     }
+
+    /**
+     * returns a single instance of HalDeviceManager for injection. Uses lazy instantiation
+     * and initialization.
+     */
+    public HalDeviceManager getHalDeviceManager() {
+        if (mHalDeviceManager == null) {
+            mHalDeviceManager = new HalDeviceManager();
+            mHalDeviceManager.initialize();
+        }
+        return mHalDeviceManager;
+    }
 }