RESTRICT AUTOMERGE resubmit "Bug fix channel utilization during high traffic" am: 05043809c3

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/net/wifi/+/12095044

Change-Id: I190cd8605dce9cf9f190e67025d6b702d0ec74b5

2 files changed, 30 insertions, 2 deletions

diff --git a/tests/wifitests/src/com/android/server/wifi/WifiChannelUtilizationTest.java b/tests/wifitests/src/com/android/server/wifi/WifiChannelUtilizationTest.java
index 31fc7b7a9..bb6ff74a3 100644
--- a/tests/wifitests/src/com/android/server/wifi/WifiChannelUtilizationTest.java
+++ b/tests/wifitests/src/com/android/server/wifi/WifiChannelUtilizationTest.java
@@ -30,10 +30,13 @@ import static org.junit.Assert.assertEquals;
 import static org.mockito.Mockito.*;
 import static org.mockito.Mockito.validateMockitoUsage;
 
+import android.content.Context;
+
 import androidx.test.filters.SmallTest;
 
 import com.android.server.wifi.WifiLinkLayerStats.ChannelStats;
 import com.android.server.wifi.util.InformationElementUtil.BssLoad;
+import com.android.wifi.resources.R;
 
 import org.junit.After;
 import org.junit.Before;
@@ -48,13 +51,19 @@ import org.mockito.MockitoAnnotations;
 public class WifiChannelUtilizationTest extends WifiBaseTest {
     private WifiChannelUtilization mWifiChannelUtilization;
     @Mock private Clock mClock;
+    @Mock Context mContext;
+    MockResources mMockResources = new MockResources();
     /**
      * Called before each test
      */
     @Before
     public void setUp() throws Exception {
         MockitoAnnotations.initMocks(this);
-        mWifiChannelUtilization = new WifiChannelUtilization(mClock);
+        when(mContext.getResources()).thenReturn(mMockResources);
+        mMockResources.setBoolean(
+                R.bool.config_wifiChannelUtilizationOverrideEnabled,
+                false);
+        mWifiChannelUtilization = new WifiChannelUtilization(mClock, mContext);
         mWifiChannelUtilization.init(null);
     }
 
@@ -428,4 +437,23 @@ public class WifiChannelUtilizationTest extends WifiBaseTest {
         mWifiChannelUtilization.setUtilizationRatio(freq, utilizationRatio);
         assertEquals(utilizationRatio, mWifiChannelUtilization.getUtilizationRatio(freq));
     }
+
+    @Test
+    public void verifyOverridingUtilizationRatio() throws Exception {
+        mMockResources.setBoolean(
+                R.bool.config_wifiChannelUtilizationOverrideEnabled,
+                true);
+        mMockResources.setInteger(
+                R.integer.config_wifiChannelUtilizationOverride2g,
+                60);
+        mMockResources.setInteger(
+                R.integer.config_wifiChannelUtilizationOverride5g,
+                20);
+        mMockResources.setInteger(
+                R.integer.config_wifiChannelUtilizationOverride6g,
+                10);
+        assertEquals(60, mWifiChannelUtilization.getUtilizationRatio(2412));
+        assertEquals(20, mWifiChannelUtilization.getUtilizationRatio(5810));
+        assertEquals(10, mWifiChannelUtilization.getUtilizationRatio(6710));
+    }
 }
diff --git a/tests/wifitests/src/com/android/server/wifi/WifiDataStallTest.java b/tests/wifitests/src/com/android/server/wifi/WifiDataStallTest.java
index 4ed08a3d1..de1e5cb4e 100644
--- a/tests/wifitests/src/com/android/server/wifi/WifiDataStallTest.java
+++ b/tests/wifitests/src/com/android/server/wifi/WifiDataStallTest.java
@@ -212,7 +212,7 @@ public class WifiDataStallTest extends WifiBaseTest {
     }
 
     /**
-     * Verify throughtput when Rx link speed is unavailable.
+     * Verify throughput when Rx link speed is unavailable.
      * Also verify the logging of channel utilization and throughput.
      */
     @Test