diff options
Diffstat (limited to 'com/android/server/wifi/WifiInjector.java')
| -rw-r--r-- | com/android/server/wifi/WifiInjector.java | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/com/android/server/wifi/WifiInjector.java b/com/android/server/wifi/WifiInjector.java index 04bb3f48..a1ecca2c 100644 --- a/com/android/server/wifi/WifiInjector.java +++ b/com/android/server/wifi/WifiInjector.java @@ -189,7 +189,7 @@ public class WifiInjector { ServiceManager.getService(Context.NETWORKMANAGEMENT_SERVICE)); mWifiNative = new WifiNative( mWifiVendorHal, mSupplicantStaIfaceHal, mHostapdHal, mWificondControl, - mNwManagementService, mPropertyService, mWifiMetrics); + mWifiMonitor, mNwManagementService, mPropertyService, mWifiMetrics); mWifiP2pMonitor = new WifiP2pMonitor(this); mSupplicantP2pIfaceHal = new SupplicantP2pIfaceHal(mWifiP2pMonitor); mWifiP2pNative = new WifiP2pNative(mSupplicantP2pIfaceHal, mHalDeviceManager); @@ -214,7 +214,7 @@ public class WifiInjector { mWifiNetworkHistory = new WifiNetworkHistory(mContext, writer); mIpConfigStore = new IpConfigStore(writer); mWifiConfigStoreLegacy = new WifiConfigStoreLegacy( - mWifiNetworkHistory, mWifiNative, mIpConfigStore, + mWifiNetworkHistory, mWifiNative, new WifiConfigStoreLegacy.IpConfigStoreWrapper(), new LegacyPasspointConfigParser()); // Config Manager mWifiConfigManager = new WifiConfigManager(mContext, mClock, @@ -273,7 +273,8 @@ public class WifiInjector { mWifiStateMachineHandlerThread.getLooper(), mFrameworkFacade, wakeupNotificationFactory); mWakeupController = new WakeupController(mContext, - mWifiStateMachineHandlerThread.getLooper(), new WakeupLock(mWifiConfigManager), + mWifiStateMachineHandlerThread.getLooper(), + new WakeupLock(mWifiConfigManager, mWifiMetrics.getWakeupMetrics(), mClock), WakeupEvaluator.fromContext(mContext), wakeupOnboarding, mWifiConfigManager, mWifiConfigStore, mWifiMetrics.getWakeupMetrics(), this, mFrameworkFacade); mLockManager = new WifiLockManager(mContext, BatteryStatsService.getService()); |