Merge "[WifiScoreReport] Don't report score if RSSI is invalid" into pi-dev

1 files changed, 4 insertions, 0 deletions

diff --git a/service/java/com/android/server/wifi/WifiScoreReport.java b/service/java/com/android/server/wifi/WifiScoreReport.java
index c6a7105be..d4d443bb2 100644
--- a/service/java/com/android/server/wifi/WifiScoreReport.java
+++ b/service/java/com/android/server/wifi/WifiScoreReport.java
@@ -89,6 +89,10 @@ public class WifiScoreReport {
      */
     public void calculateAndReportScore(WifiInfo wifiInfo, NetworkAgent networkAgent,
                                         WifiMetrics wifiMetrics) {
+        if (wifiInfo.getRssi() == WifiInfo.INVALID_RSSI) {
+            Log.d(TAG, "Not reporting score because RSSI is invalid");
+            return;
+        }
         int score;
 
         long millis = mClock.getWallClockMillis();