Limit testWifiUsabilityStatsEntry to vendor version Q and above
Test is failing on R builds with P vendor version because many stats are
not being collected in P.
Bug: 165880695
Test: atest ConnectedNetworkScorerTest
Change-Id: Ic67aebf8dc12726b14953a71917a681f685f8aa1
Merged-In: Ic67aebf8dc12726b14953a71917a681f685f8aa1
(cherry picked from commit fb549fed0fdbf29577f6f3d9d67e17ecb0cf9fc1)
diff --git a/tests/tests/wifi/src/android/net/wifi/cts/ConnectedNetworkScorerTest.java b/tests/tests/wifi/src/android/net/wifi/cts/ConnectedNetworkScorerTest.java
index 0adf3b9..8502db1 100644
--- a/tests/tests/wifi/src/android/net/wifi/cts/ConnectedNetworkScorerTest.java
+++ b/tests/tests/wifi/src/android/net/wifi/cts/ConnectedNetworkScorerTest.java
@@ -31,6 +31,7 @@
import android.net.wifi.WifiConfiguration;
import android.net.wifi.WifiManager;
import android.net.wifi.WifiUsabilityStatsEntry;
+import android.os.Build;
import android.platform.test.annotations.AppModeFull;
import android.support.test.uiautomator.UiDevice;
import android.telephony.TelephonyManager;
@@ -40,6 +41,7 @@
import androidx.test.runner.AndroidJUnit4;
import com.android.compatibility.common.util.PollingCheck;
+import com.android.compatibility.common.util.PropertyUtil;
import com.android.compatibility.common.util.ShellIdentityUtils;
import com.android.compatibility.common.util.SystemUtil;
@@ -158,6 +160,10 @@
*/
@Test
public void testWifiUsabilityStatsEntry() throws Exception {
+ // Usability stats collection only supported by vendor version Q and above.
+ if (!PropertyUtil.isVendorApiLevelAtLeast(Build.VERSION_CODES.Q)) {
+ return;
+ }
CountDownLatch countDownLatch = new CountDownLatch(1);
UiAutomation uiAutomation = InstrumentationRegistry.getInstrumentation().getUiAutomation();
TestUsabilityStatsListener usabilityStatsListener =