WakeupEvaluator - use ScoringParams properly

Bug: 74793980
Test: atest WakeupEvaluatorTest
Change-Id: I84f39225abd9125446b584b1138770178bc91c5c

2 files changed, 7 insertions, 23 deletions

diff --git a/service/java/com/android/server/wifi/WakeupEvaluator.java b/service/java/com/android/server/wifi/WakeupEvaluator.java
index b98a4fd23..63b88b542 100644
--- a/service/java/com/android/server/wifi/WakeupEvaluator.java
+++ b/service/java/com/android/server/wifi/WakeupEvaluator.java
@@ -16,11 +16,8 @@
 
 package com.android.server.wifi;
 
-import android.content.Context;
 import android.net.wifi.ScanResult;
 
-import com.android.internal.annotations.VisibleForTesting;
-
 import java.util.Collection;
 
 /**
@@ -28,22 +25,10 @@ import java.util.Collection;
  */
 public class WakeupEvaluator {
 
-    private final int mThresholdMinimumRssi24;
-    private final int mThresholdMinimumRssi5;
-
-    /**
-     * Constructs a {@link WakeupEvaluator} using the given context.
-     */
-    public static WakeupEvaluator fromContext(Context context) {
-        ScoringParams scoringParams = new ScoringParams(context); // TODO(b/74793980) - replumb
-        return new WakeupEvaluator(scoringParams.getEntryRssi(ScoringParams.BAND2),
-                                   scoringParams.getEntryRssi(ScoringParams.BAND5));
-    }
+    private final ScoringParams mScoringParams;
 
-    @VisibleForTesting
-    WakeupEvaluator(int minimumRssi24, int minimumRssi5) {
-        mThresholdMinimumRssi24 = minimumRssi24;
-        mThresholdMinimumRssi5 = minimumRssi5;
+    WakeupEvaluator(ScoringParams scoringParams) {
+        mScoringParams = scoringParams;
     }
 
     /**
@@ -80,7 +65,6 @@ public class WakeupEvaluator {
      * Returns whether the given ScanResult's signal strength is below the selection threshold.
      */
     public boolean isBelowThreshold(ScanResult scanResult) {
-        return ((scanResult.is24GHz() && scanResult.level < mThresholdMinimumRssi24)
-                || (scanResult.is5GHz() && scanResult.level < mThresholdMinimumRssi5));
+        return scanResult.level < mScoringParams.getEntryRssi(scanResult.frequency);
     }
 }
diff --git a/service/java/com/android/server/wifi/WifiInjector.java b/service/java/com/android/server/wifi/WifiInjector.java
index c03c46aad..1c4e51a34 100644
--- a/service/java/com/android/server/wifi/WifiInjector.java
+++ b/service/java/com/android/server/wifi/WifiInjector.java
@@ -300,7 +300,7 @@ public class WifiInjector {
         mWakeupController = new WakeupController(mContext,
                 mWifiCoreHandlerThread.getLooper(),
                 new WakeupLock(mWifiConfigManager, mWifiMetrics.getWakeupMetrics(), mClock),
-                WakeupEvaluator.fromContext(mContext), wakeupOnboarding, mWifiConfigManager,
+                new WakeupEvaluator(mScoringParams), wakeupOnboarding, mWifiConfigManager,
                 mWifiConfigStore, mWifiMetrics.getWakeupMetrics(), this, mFrameworkFacade,
                 mClock);
         mLockManager = new WifiLockManager(mContext, BatteryStatsService.getService(),
@@ -470,8 +470,8 @@ public class WifiInjector {
         return mWifiScoreCard;
     }
 
+    /** Gets a TelephonyManager, which moy not be available early on. */
     public TelephonyManager makeTelephonyManager() {
-        // may not be available when WiFi starts
         return (TelephonyManager) mContext.getSystemService(Context.TELEPHONY_SERVICE);
     }
 
@@ -483,6 +483,7 @@ public class WifiInjector {
         return mDppManager;
     }
 
+    /** Gets IWificond without caching. */
     public IWificond makeWificond() {
         // We depend on being able to refresh our binder in ClientModeImpl, so don't cache it.
         IBinder binder = ServiceManager.getService(WIFICOND_SERVICE_NAME);
@@ -491,7 +492,6 @@ public class WifiInjector {
 
     /**
      * Create a SoftApManager.
-     * @param listener listener for SoftApManager
      * @param config SoftApModeConfiguration object holding the config and mode
      * @return an instance of SoftApManager
      */