Merge "Remove a bunch of dead wifi code" into mm-wireless-dev

9 files changed, 5 insertions, 117 deletions

diff --git a/service/java/com/android/server/wifi/ScanDetail.java b/service/java/com/android/server/wifi/ScanDetail.java
index 59c512771..1f4024a2a 100644
--- a/service/java/com/android/server/wifi/ScanDetail.java
+++ b/service/java/com/android/server/wifi/ScanDetail.java
@@ -27,11 +27,9 @@ import com.android.server.wifi.anqp.RawByteElement;
 import com.android.server.wifi.anqp.VenueNameElement;
 import com.android.server.wifi.hotspot2.NetworkDetail;
 import com.android.server.wifi.hotspot2.PasspointMatch;
-import com.android.server.wifi.hotspot2.PasspointMatchInfo;
 import com.android.server.wifi.hotspot2.Utils;
 import com.android.server.wifi.hotspot2.pps.HomeSP;
 
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
diff --git a/service/java/com/android/server/wifi/SupplicantStateTracker.java b/service/java/com/android/server/wifi/SupplicantStateTracker.java
index bceb908af..f4001a4ee 100644
--- a/service/java/com/android/server/wifi/SupplicantStateTracker.java
+++ b/service/java/com/android/server/wifi/SupplicantStateTracker.java
@@ -274,11 +274,6 @@ public class SupplicantStateTracker extends StateMachine {
         @Override
          public void enter() {
              if (DBG) Log.d(TAG, getName() + "\n");
-             /* If a disconnect event happens after authentication failure
-              * exceeds maximum retries, disable the network
-              */
-             Message message = getCurrentMessage();
-             StateChangeResult stateChangeResult = (StateChangeResult) message.obj;
          }
     }
 
diff --git a/service/java/com/android/server/wifi/SupplicantWifiScannerImpl.java b/service/java/com/android/server/wifi/SupplicantWifiScannerImpl.java
index c30dd17ee..90413ff85 100644
--- a/service/java/com/android/server/wifi/SupplicantWifiScannerImpl.java
+++ b/service/java/com/android/server/wifi/SupplicantWifiScannerImpl.java
@@ -555,7 +555,6 @@ public class SupplicantWifiScannerImpl extends WifiScannerImpl implements Handle
                 int reportNumScansThreshold, int reportPercentThreshold) {
             this.backgroundScanActive = true;
             this.scanId = scanId;
-            this.startTime = startTime;
             this.maxAps = maxAps;
             this.reportEvents = reportEvents;
             this.reportNumScansThreshold = reportNumScansThreshold;
diff --git a/service/java/com/android/server/wifi/WifiConfigManager.java b/service/java/com/android/server/wifi/WifiConfigManager.java
index a0315d296..6a1035914 100644
--- a/service/java/com/android/server/wifi/WifiConfigManager.java
+++ b/service/java/com/android/server/wifi/WifiConfigManager.java
@@ -1497,7 +1497,7 @@ public class WifiConfigManager {
         boolean ret = mWifiNative.removeNetwork(netId);
         if (ret) {
             removeConfigAndSendBroadcastIfNeeded(netId);
-            if (config != null && config.isPasspoint()) {
+            if (config.isPasspoint()) {
                 writePasspointConfigs(config.FQDN, null);
             }
         }
@@ -3342,44 +3342,14 @@ public class WifiConfigManager {
         return encryption.contains("WEP");
     }
 
-    private boolean isEncryptionWep(ScanResult scan) {
-        String scanResultEncrypt = scan.capabilities;
-        return isEncryptionWep(scanResultEncrypt);
-    }
-
-    private boolean isEncryptionWep(WifiConfiguration config) {
-        String configEncrypt = config.configKey();
-        return isEncryptionWep(configEncrypt);
-    }
-
     private boolean isEncryptionPsk(String encryption) {
         return encryption.contains("PSK");
     }
 
-    private boolean isEncryptionPsk(ScanResult scan) {
-        String scanResultEncrypt = scan.capabilities;
-        return isEncryptionPsk(scanResultEncrypt);
-    }
-
-    private boolean isEncryptionPsk(WifiConfiguration config) {
-        String configEncrypt = config.configKey();
-        return isEncryptionPsk(configEncrypt);
-    }
-
     private boolean isEncryptionEap(String encryption) {
         return encryption.contains("EAP");
     }
 
-    private boolean isEncryptionEap(ScanResult scan) {
-        String scanResultEncrypt = scan.capabilities;
-        return isEncryptionEap(scanResultEncrypt);
-    }
-
-    private boolean isEncryptionEap(WifiConfiguration config) {
-        String configEncrypt = config.configKey();
-        return isEncryptionEap(configEncrypt);
-    }
-
     public boolean isOpenNetwork(String encryption) {
         if (!isEncryptionWep(encryption) && !isEncryptionPsk(encryption)
                 && !isEncryptionEap(encryption)) {
diff --git a/service/java/com/android/server/wifi/WifiServiceImpl.java b/service/java/com/android/server/wifi/WifiServiceImpl.java
index e7045a527..30458524c 100644
--- a/service/java/com/android/server/wifi/WifiServiceImpl.java
+++ b/service/java/com/android/server/wifi/WifiServiceImpl.java
@@ -1157,9 +1157,9 @@ public class WifiServiceImpl extends IWifiManager.Stub {
                 if (++dnsFound > 1) break;
             }
         }
-        InetAddress serverAddress = dhcpResults.serverAddress;
-        if (serverAddress instanceof Inet4Address) {
-            info.serverAddress = NetworkUtils.inetAddressToInt((Inet4Address)serverAddress);
+        Inet4Address serverAddress = dhcpResults.serverAddress;
+        if (serverAddress != null) {
+            info.serverAddress = NetworkUtils.inetAddressToInt(serverAddress);
         }
         info.leaseDuration = dhcpResults.leaseDuration;
 
diff --git a/service/java/com/android/server/wifi/WifiStateMachine.java b/service/java/com/android/server/wifi/WifiStateMachine.java
index 073c95b31..be4742631 100644
--- a/service/java/com/android/server/wifi/WifiStateMachine.java
+++ b/service/java/com/android/server/wifi/WifiStateMachine.java
@@ -230,8 +230,6 @@ public class WifiStateMachine extends StateMachine implements WifiNative.WifiPno
 
     private boolean mHalBasedPnoDriverSupported = false;
 
-    // Below booleans are configurations coming from the Developper Settings
-    private boolean mEnableAssociatedNetworkSwitchingInDevSettings = true;
     private boolean mHalBasedPnoEnableInDevSettings = false;
 
     private int mHalFeatureSet = 0;
@@ -596,7 +594,6 @@ public class WifiStateMachine extends StateMachine implements WifiNative.WifiPno
 
     private AlarmManager mAlarmManager;
     private PendingIntent mScanIntent;
-    private PendingIntent mDriverStopIntent;
     private PendingIntent mPnoIntent;
 
     private int mDisconnectedPnoAlarmCount = 0;
@@ -1847,7 +1844,6 @@ public class WifiStateMachine extends StateMachine implements WifiNative.WifiPno
     private int mRxTimeThisScan = 0;
 
     private int mOnTimeScreenStateChange = 0;
-    private int mOnTimeAtLastReport = 0;
     private long lastOntimeReportTimeStamp = 0;
     private long lastScreenStateChangeTimeStamp = 0;
     private int mOnTimeLastReport = 0;
@@ -6205,7 +6201,6 @@ public class WifiStateMachine extends StateMachine implements WifiNative.WifiPno
 
     void registerDisconnected() {
         if (mLastNetworkId != WifiConfiguration.INVALID_NETWORK_ID) {
-            long now_ms = System.currentTimeMillis();
             // We are switching away from this configuration,
             // hence record the time we were connected last
             WifiConfiguration config = mWifiConfigManager.getWifiConfiguration(mLastNetworkId);
diff --git a/service/java/com/android/server/wifi/WifiTrafficPoller.java b/service/java/com/android/server/wifi/WifiTrafficPoller.java
index dfaccb4c9..38ec1a5b6 100644
--- a/service/java/com/android/server/wifi/WifiTrafficPoller.java
+++ b/service/java/com/android/server/wifi/WifiTrafficPoller.java
@@ -44,7 +44,7 @@ final class WifiTrafficPoller {
     private boolean DBG = false;
     private boolean VDBG = false;
 
-    private final String TAG = "WifiTrafficPoller";
+    private static final String TAG = "WifiTrafficPoller";
     /**
      * Interval in milliseconds between polling for traffic
      * statistics
diff --git a/service/java/com/android/server/wifi/hotspot2/SupplicantBridge.java b/service/java/com/android/server/wifi/hotspot2/SupplicantBridge.java
index a4243a41e..698968e6d 100644
--- a/service/java/com/android/server/wifi/hotspot2/SupplicantBridge.java
+++ b/service/java/com/android/server/wifi/hotspot2/SupplicantBridge.java
@@ -275,69 +275,6 @@ public class SupplicantBridge {
         return sb.toString();
     }
 
-    /**
-     * Build a wpa_supplicant ANQP query command
-     * @param networkDetail The network to query.
-     * @param matchSet Add ANQP elements necessary for SP matching.
-     * @param osu Add the OSU Provider list element.
-     * @return A command string.
-     */
-    private static String buildWPSQueryRequest(NetworkDetail networkDetail,
-                                               boolean matchSet, boolean osu) {
-        List<Constants.ANQPElementType> querySet = new ArrayList<>();
-
-        if (matchSet) {
-            querySet.addAll(ANQPFactory.getBaseANQPSet(networkDetail.getAnqpOICount() > 0));
-        }
-
-        if (networkDetail.getHSRelease() != null) {
-            boolean includeOSU = osu && networkDetail.getHSRelease() == NetworkDetail.HSRelease.R2;
-            if (matchSet) {
-                querySet.addAll(ANQPFactory.getHS20ANQPSet(includeOSU));
-            }
-            else if (includeOSU) {
-                querySet.add(Constants.ANQPElementType.HSOSUProviders);
-            }
-        }
-
-        if (querySet.isEmpty()) {
-            return null;
-        }
-
-        StringBuilder sb = new StringBuilder();
-        if (matchSet) {
-            sb.append("ANQP_GET ");
-        }
-        else {
-            sb.append("HS20_ANQP_GET ");     // ANQP_GET does not work for a sole hs20:8 (OSU) query
-        }
-        sb.append(networkDetail.getBSSIDString()).append(' ');
-
-        boolean first = true;
-        for (Constants.ANQPElementType elementType : querySet) {
-            if (first) {
-                first = false;
-            }
-            else {
-                sb.append(',');
-            }
-
-            Integer id = Constants.getANQPElementID(elementType);
-            if (id != null) {
-                sb.append(id);
-            }
-            else {
-                id = Constants.getHS20ElementID(elementType);
-                if (matchSet) {
-                    sb.append("hs20:");
-                }
-                sb.append(id);
-            }
-        }
-
-        return sb.toString();
-    }
-
     private static List<String> getWPSNetCommands(String netID, NetworkDetail networkDetail,
                                                  Credential credential) {
 
diff --git a/service/java/com/android/server/wifi/p2p/WifiP2pServiceImpl.java b/service/java/com/android/server/wifi/p2p/WifiP2pServiceImpl.java
index 89ed269b3..05e23356d 100644
--- a/service/java/com/android/server/wifi/p2p/WifiP2pServiceImpl.java
+++ b/service/java/com/android/server/wifi/p2p/WifiP2pServiceImpl.java
@@ -17,7 +17,6 @@
 package com.android.server.wifi.p2p;
 
 import android.app.AlertDialog;
-import android.app.Notification;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.DialogInterface.OnClickListener;
@@ -106,7 +105,6 @@ public class WifiP2pServiceImpl extends IWifiP2pManager.Stub {
     private static final String NETWORKTYPE = "WIFI_P2P";
 
     private Context mContext;
-    private Notification mNotification;
 
     INetworkManagementService mNwService;
     private DhcpClient mDhcpClient;
@@ -524,9 +522,6 @@ public class WifiP2pServiceImpl extends IWifiP2pManager.Stub {
         // or if it is connected without any ongoing join request
         private WifiP2pConfig mSavedPeerConfig = new WifiP2pConfig();
 
-        // Saved WifiP2pGroup from invitation request
-        private WifiP2pGroup mSavedP2pGroup;
-
         P2pStateMachine(String name, Looper looper, boolean p2pSupported) {
             super(name, looper);
 
@@ -2204,7 +2199,6 @@ public class WifiP2pServiceImpl extends IWifiP2pManager.Stub {
         pw.println("mWifiP2pInfo " + mWifiP2pInfo);
         pw.println("mGroup " + mGroup);
         pw.println("mSavedPeerConfig " + mSavedPeerConfig);
-        pw.println("mSavedP2pGroup " + mSavedP2pGroup);
         pw.println();
     }