From e185ee5267de1257f21caa30a5f44d64600160a2 Mon Sep 17 00:00:00 2001
From: Michael Plass <mplass@google.com>
Date: Tue, 28 Mar 2017 16:13:20 -0700
Subject: Remove WifiNative.setLinkLayerStats

Link layer stats are always enabled now, so remove this unneeded call.

Similarly for setDfsFlag() - DFS is always on.

Bug: 36087365
Test: Unit tests pass
Change-Id: I05a971b3fa9ac17f41990ace125733570de55f4c
---
 service/java/com/android/server/wifi/WifiNative.java       | 14 --------------
 service/java/com/android/server/wifi/WifiStateMachine.java |  6 ------
 service/java/com/android/server/wifi/WifiVendorHal.java    | 11 -----------
 3 files changed, 31 deletions(-)

(limited to 'service')

diff --git a/service/java/com/android/server/wifi/WifiNative.java b/service/java/com/android/server/wifi/WifiNative.java
index 5e448ad07..c2d7b6a3f 100644
--- a/service/java/com/android/server/wifi/WifiNative.java
+++ b/service/java/com/android/server/wifi/WifiNative.java
@@ -1051,10 +1051,6 @@ public class WifiNative {
         return mWifiVendorHal.getWifiLinkLayerStats();
     }
 
-    public void setWifiLinkLayerStats(String iface, int enable) {
-        // TODO(b//36087365) Remove this. Link layer stats is enabled when the HAL is started.
-    }
-
     /**
      * Get the supported features
      *
@@ -1142,16 +1138,6 @@ public class WifiNative {
         return mWifiVendorHal.isGetChannelsForBandSupported();
     }
 
-    /**
-     * Set DFS - actually, this is always on.
-     *
-     * @param dfsOn
-     * @return success indication
-     */
-    public boolean setDfsFlag(boolean dfsOn) {
-        return mWifiVendorHal.setDfsFlag(dfsOn);
-    }
-
     /**
      * RTT (Round Trip Time) measurement capabilities of the device.
      */
diff --git a/service/java/com/android/server/wifi/WifiStateMachine.java b/service/java/com/android/server/wifi/WifiStateMachine.java
index d6ef5e870..6e5887897 100644
--- a/service/java/com/android/server/wifi/WifiStateMachine.java
+++ b/service/java/com/android/server/wifi/WifiStateMachine.java
@@ -4100,9 +4100,6 @@ public class WifiStateMachine extends StateMachine implements WifiNative.WifiRss
 
             mWifiNative.setExternalSim(true);
 
-            /* turn on use of DFS channels */
-            mWifiNative.setDfsFlag(true);
-
             setRandomMacOui();
             mCountryCode.setReadyForChange(true);
 
@@ -4172,9 +4169,6 @@ public class WifiStateMachine extends StateMachine implements WifiNative.WifiRss
             intent.putExtra(WifiManager.EXTRA_SCAN_AVAILABLE, WIFI_STATE_ENABLED);
             mContext.sendStickyBroadcastAsUser(intent, UserHandle.ALL);
 
-            // Enable link layer stats gathering
-            mWifiNative.setWifiLinkLayerStats("wlan0", 1);
-
             // Disable wpa_supplicant from auto reconnecting.
             mWifiNative.enableStaAutoReconnect(false);
             // STA has higher priority over P2P
diff --git a/service/java/com/android/server/wifi/WifiVendorHal.java b/service/java/com/android/server/wifi/WifiVendorHal.java
index 8646b613b..9a73425dc 100644
--- a/service/java/com/android/server/wifi/WifiVendorHal.java
+++ b/service/java/com/android/server/wifi/WifiVendorHal.java
@@ -64,7 +64,6 @@ import android.net.wifi.WifiManager;
 import android.net.wifi.WifiScanner;
 import android.net.wifi.WifiSsid;
 import android.net.wifi.WifiWakeReasonAndCounts;
-import android.os.HandlerThread;
 import android.os.Looper;
 import android.os.RemoteException;
 import android.util.MutableBoolean;
@@ -1457,16 +1456,6 @@ public class WifiVendorHal {
         return false;
     }
 
-    /**
-     * Set DFS - actually, this is always on.
-     *
-     * @param dfsOn
-     * @return success indication
-     */
-    public boolean setDfsFlag(boolean dfsOn) {
-        return dfsOn;
-    }
-
     /**
      * Get the APF (Android Packet Filter) capabilities of the device
      */
-- 
cgit v1.2.3