summaryrefslogtreecommitdiff
path: root/service
diff options
context:
space:
mode:
Diffstat (limited to 'service')
-rw-r--r--service/java/com/android/server/wifi/WifiChannelUtilization.java27
-rw-r--r--service/java/com/android/server/wifi/WifiInjector.java4
-rw-r--r--service/res/values/config.xml9
-rw-r--r--service/res/values/overlayable.xml4
4 files changed, 4 insertions, 40 deletions
diff --git a/service/java/com/android/server/wifi/WifiChannelUtilization.java b/service/java/com/android/server/wifi/WifiChannelUtilization.java
index 5e8cde61d..906e2d04c 100644
--- a/service/java/com/android/server/wifi/WifiChannelUtilization.java
+++ b/service/java/com/android/server/wifi/WifiChannelUtilization.java
@@ -19,8 +19,6 @@ package com.android.server.wifi;
import static android.net.wifi.WifiManager.DEVICE_MOBILITY_STATE_STATIONARY;
import static android.net.wifi.WifiManager.DEVICE_MOBILITY_STATE_UNKNOWN;
-import android.content.Context;
-import android.net.wifi.ScanResult;
import android.net.wifi.WifiManager.DeviceMobilityState;
import android.util.Log;
import android.util.SparseArray;
@@ -29,7 +27,6 @@ import android.util.SparseIntArray;
import com.android.internal.annotations.VisibleForTesting;
import com.android.server.wifi.WifiLinkLayerStats.ChannelStats;
import com.android.server.wifi.util.InformationElementUtil.BssLoad;
-import com.android.wifi.resources.R;
import java.util.ArrayDeque;
import java.util.Iterator;
@@ -63,7 +60,6 @@ public class WifiChannelUtilization {
@VisibleForTesting
static final int CHANNEL_STATS_CACHE_SIZE = 5;
private final Clock mClock;
- private final Context mContext;
private @DeviceMobilityState int mDeviceMobilityState = DEVICE_MOBILITY_STATE_UNKNOWN;
private int mCacheUpdateIntervalMinMs = DEFAULT_CACHE_UPDATE_INTERVAL_MIN_MS;
@@ -76,8 +72,7 @@ public class WifiChannelUtilization {
private long mLastChannelStatsMapTimeStamp;
private int mLastChannelStatsMapMobilityState;
- WifiChannelUtilization(Clock clock, Context context) {
- mContext = context;
+ WifiChannelUtilization(Clock clock) {
mClock = clock;
}
@@ -90,7 +85,7 @@ public class WifiChannelUtilization {
}
/**
- * (Re)initialize internal variables and status
+ * Initialize internal variables and status after wifi is enabled
* @param wifiLinkLayerStats The latest wifi link layer stats
*/
public void init(WifiLinkLayerStats wifiLinkLayerStats) {
@@ -125,19 +120,6 @@ public class WifiChannelUtilization {
* @return Utilization ratio value if it is available; BssLoad.INVALID otherwise
*/
public int getUtilizationRatio(int frequency) {
- if (mContext.getResources().getBoolean(
- R.bool.config_wifiChannelUtilizationOverrideEnabled)) {
- if (ScanResult.is24GHz(frequency)) {
- return mContext.getResources().getInteger(
- R.integer.config_wifiChannelUtilizationOverride2g);
- }
- if (ScanResult.is5GHz(frequency)) {
- return mContext.getResources().getInteger(
- R.integer.config_wifiChannelUtilizationOverride5g);
- }
- return mContext.getResources().getInteger(
- R.integer.config_wifiChannelUtilizationOverride6g);
- }
return mChannelUtilizationMap.get(frequency, BssLoad.INVALID);
}
@@ -171,11 +153,6 @@ public class WifiChannelUtilization {
*/
public void refreshChannelStatsAndChannelUtilization(WifiLinkLayerStats wifiLinkLayerStats,
int frequency) {
- if (mContext.getResources().getBoolean(
- R.bool.config_wifiChannelUtilizationOverrideEnabled)) {
- return;
- }
-
if (wifiLinkLayerStats == null) {
return;
}
diff --git a/service/java/com/android/server/wifi/WifiInjector.java b/service/java/com/android/server/wifi/WifiInjector.java
index b9aa0521f..8f6465b00 100644
--- a/service/java/com/android/server/wifi/WifiInjector.java
+++ b/service/java/com/android/server/wifi/WifiInjector.java
@@ -329,7 +329,7 @@ public class WifiInjector {
mWifiDiagnostics = new WifiDiagnostics(
mContext, this, mWifiNative, mBuildProperties,
new LastMileLogger(this), mClock);
- mWifiChannelUtilizationConnected = new WifiChannelUtilization(mClock, mContext);
+ mWifiChannelUtilizationConnected = new WifiChannelUtilization(mClock);
mWifiDataStall = new WifiDataStall(mFrameworkFacade, mWifiMetrics, mContext,
mDeviceConfigFacade, mWifiChannelUtilizationConnected, mClock, wifiHandler,
mThroughputPredictor);
@@ -617,7 +617,7 @@ public class WifiInjector {
mBssidBlocklistMonitor = new BssidBlocklistMonitor(mContext, mWifiConnectivityHelper,
mWifiLastResortWatchdog, mClock, mConnectivityLocalLog, mWifiScoreCard);
mWifiMetrics.setBssidBlocklistMonitor(mBssidBlocklistMonitor);
- mWifiChannelUtilizationScan = new WifiChannelUtilization(mClock, mContext);
+ mWifiChannelUtilizationScan = new WifiChannelUtilization(mClock);
return new WifiConnectivityManager(mContext, getScoringParams(),
clientModeImpl, this,
mWifiConfigManager, mWifiNetworkSuggestionsManager, clientModeImpl.getWifiInfo(),
diff --git a/service/res/values/config.xml b/service/res/values/config.xml
index cc80f608c..4ea23adc0 100644
--- a/service/res/values/config.xml
+++ b/service/res/values/config.xml
@@ -422,15 +422,6 @@
<!-- Integer indicating the RSSI and link layer stats polling interval in milliseconds when device is connected and screen is on -->
<integer translatable="false" name="config_wifiPollRssiIntervalMilliseconds">3000</integer>
- <!-- Override channel utilization estimation with fixed value -->
- <bool translatable="false" name="config_wifiChannelUtilizationOverrideEnabled">true</bool>
- <!-- Integer values represent the channel utilization in different RF bands when
- config_wifiChannelUtilizationOverridingEnabled is true.
- They should be set to [0, 255] corresponding to utilization ratio between 0 and 1 -->
- <integer translatable="false" name="config_wifiChannelUtilizationOverride2g">80</integer>
- <integer translatable="false" name="config_wifiChannelUtilizationOverride5g">15</integer>
- <integer translatable="false" name="config_wifiChannelUtilizationOverride6g">10</integer>
-
<!-- Enable WPA2 to WPA3 auto-upgrade -->
<bool translatable="false" name="config_wifiSaeUpgradeEnabled">true</bool>
diff --git a/service/res/values/overlayable.xml b/service/res/values/overlayable.xml
index a4b7011b0..b02eb9e77 100644
--- a/service/res/values/overlayable.xml
+++ b/service/res/values/overlayable.xml
@@ -132,10 +132,6 @@
<item type="integer" name="config_wifiHighMovementNetworkSelectionOptimizationRssiDelta" />
<item type="integer" name="config_wifiRttBackgroundExecGapMs" />
<item type="integer" name="config_wifiPollRssiIntervalMilliseconds" />
- <item type="bool" name="config_wifiChannelUtilizationOverrideEnabled" />
- <item type="integer" name="config_wifiChannelUtilizationOverride2g" />
- <item type="integer" name="config_wifiChannelUtilizationOverride5g" />
- <item type="integer" name="config_wifiChannelUtilizationOverride6g" />
<item type="bool" name="config_wifiSaeUpgradeEnabled" />
<item type="bool" name="config_wifiSaeUpgradeOffloadEnabled" />
<item type="integer" name="config_wifiMaxNativeFailureSelfRecoveryPerHour" />
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-22 16:07:08 +0000