diff options
3 files changed, 0 insertions, 31 deletions
diff --git a/service/java/com/android/server/wifi/WifiNative.java b/service/java/com/android/server/wifi/WifiNative.java index f6a7e7c39..541be9c5a 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 * @@ -1143,16 +1139,6 @@ public class WifiNative { } /** - * 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. */ public RttManager.RttCapabilities getRttCapabilities() { diff --git a/service/java/com/android/server/wifi/WifiStateMachine.java b/service/java/com/android/server/wifi/WifiStateMachine.java index d8971ae8b..e8d85cd75 100644 --- a/service/java/com/android/server/wifi/WifiStateMachine.java +++ b/service/java/com/android/server/wifi/WifiStateMachine.java @@ -4096,9 +4096,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); @@ -4168,9 +4165,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; @@ -1458,16 +1457,6 @@ public class WifiVendorHal { } /** - * 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 */ public ApfCapabilities getApfCapabilities() { |