Remove reference to ScanResult.java removed fields

These fields are only copied around but not updated, therefore it should
be safe to delete them.

Bug: 67419731
Test: compile, run frameworks/opt/net/wifi/tests/wifitests/runtests.sh
Change-Id: I776347741f858aa8d82316718c386978ecbf5158

4 files changed, 0 insertions, 28 deletions

diff --git a/service/java/com/android/server/wifi/ScanDetailCache.java b/service/java/com/android/server/wifi/ScanDetailCache.java
index abb6ad8b0..b7f541162 100644
--- a/service/java/com/android/server/wifi/ScanDetailCache.java
+++ b/service/java/com/android/server/wifi/ScanDetailCache.java
@@ -150,12 +150,6 @@ public class ScanDetailCache {
                 public int compare(Object o1, Object o2) {
                     ScanResult a = ((ScanDetail) o1).getScanResult();
                     ScanResult b = ((ScanDetail) o2).getScanResult();
-                    if (a.numIpConfigFailures > b.numIpConfigFailures) {
-                        return 1;
-                    }
-                    if (a.numIpConfigFailures < b.numIpConfigFailures) {
-                        return -1;
-                    }
                     if (a.seen > b.seen) {
                         return -1;
                     }
@@ -273,10 +267,6 @@ public class ScanDetailCache {
                     sbuf.append(String.format(",%4d.%02d.%02d.%02d.%03dms", ageDay,
                             ageHour, ageMin, ageSec, ageMilli));
                 }
-                if (result.numIpConfigFailures > 0) {
-                    sbuf.append(",ipfail=");
-                    sbuf.append(result.numIpConfigFailures);
-                }
                 sbuf.append("} ");
             }
             sbuf.append('\n');
diff --git a/service/java/com/android/server/wifi/WifiConfigManager.java b/service/java/com/android/server/wifi/WifiConfigManager.java
index 42062c4ab..e443cd425 100644
--- a/service/java/com/android/server/wifi/WifiConfigManager.java
+++ b/service/java/com/android/server/wifi/WifiConfigManager.java
@@ -1907,13 +1907,6 @@ public class WifiConfigManager {
         }
 
         // Adding a new BSSID
-        ScanResult result = scanDetailCache.getScanResult(scanResult.BSSID);
-        if (result != null) {
-            // transfer the black list status
-            scanResult.blackListTimestamp = result.blackListTimestamp;
-            scanResult.numIpConfigFailures = result.numIpConfigFailures;
-            scanResult.numConnection = result.numConnection;
-        }
         if (config.ephemeral) {
             // For an ephemeral Wi-Fi config, the ScanResult should be considered
             // untrusted.
diff --git a/service/java/com/android/server/wifi/WifiStateMachine.java b/service/java/com/android/server/wifi/WifiStateMachine.java
index b7274f720..dd9c43997 100644
--- a/service/java/com/android/server/wifi/WifiStateMachine.java
+++ b/service/java/com/android/server/wifi/WifiStateMachine.java
@@ -3456,16 +3456,6 @@ public class WifiStateMachine extends StateMachine implements WifiNative.WifiRss
             // Tell the framework whether the newly connected network is trusted or untrusted.
             updateCapabilities(c);
         }
-        if (c != null) {
-            ScanResult result = getCurrentScanResult();
-            if (result == null) {
-                logd("WifiStateMachine: handleSuccessfulIpConfiguration and no scan results" +
-                        c.configKey());
-            } else {
-                // Clear the per BSSID failure count
-                result.numIpConfigFailures = 0;
-            }
-        }
     }
 
     private void handleIPv4Failure() {
diff --git a/service/java/com/android/server/wifi/WifiVendorHal.java b/service/java/com/android/server/wifi/WifiVendorHal.java
index d6b568d51..add8a7a31 100644
--- a/service/java/com/android/server/wifi/WifiVendorHal.java
+++ b/service/java/com/android/server/wifi/WifiVendorHal.java
@@ -2592,7 +2592,6 @@ public class WifiVendorHal {
         frameworkScanResult.level = scanResult.rssi;
         frameworkScanResult.frequency = scanResult.frequency;
         frameworkScanResult.timestamp = scanResult.timeStampInUs;
-        frameworkScanResult.bytes = hidlIeArrayToFrameworkIeBlob(scanResult.informationElements);
         return frameworkScanResult;
     }