commit 29d5250cd5a1cf344a6c7a134cbd5796435c5305
author Hai Shalom <haishalom@google.com> Mon Apr 26 11:34:41 2021 -0700
committer Etan Cohen <etancohen@google.com> Mon Apr 26 20:19:19 2021 +0000
tree 4923527b538d22c2af5c02bebc9ecc36c917a4e5
parent b95ce3fc490aa99c607cf047a17adcce332d07ac

Validate enabled FEATURE_WIFI_PASSPOINT per CDD requirements

Bug: 186176226
Test: atest WifiManagerTest
Change-Id: I89c7819f04aa60516ce3a01f91ae73a8bb071472

tests/tests/wifi/src/android/net/wifi/cts/WifiManagerTest.java

diff --git a/tests/tests/wifi/src/android/net/wifi/cts/WifiManagerTest.java b/tests/tests/wifi/src/android/net/wifi/cts/WifiManagerTest.java
index 3ca5d3c..062424b 100644
--- a/tests/tests/wifi/src/android/net/wifi/cts/WifiManagerTest.java
+++ b/tests/tests/wifi/src/android/net/wifi/cts/WifiManagerTest.java
@@ -38,7 +38,6 @@
 import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
 import android.net.ConnectivityManager;
-import android.net.LinkProperties;
 import android.net.MacAddress;
 import android.net.Network;
 import android.net.NetworkCapabilities;
@@ -88,11 +87,11 @@
 import androidx.test.filters.SdkSuppress;
 import androidx.test.platform.app.InstrumentationRegistry;
 
+import com.android.compatibility.common.util.FeatureUtil;
 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;
-import com.android.compatibility.common.util.FeatureUtil;
 import com.android.compatibility.common.util.ThrowingRunnable;
 import com.android.net.module.util.MacAddressUtils;
 
@@ -4284,4 +4283,19 @@
             uiAutomation.dropShellPermissionIdentity();
         }
     }
+
+    /**
+     * Validate that the Passpoint feature is enabled on the device.
+     * TODO(b/167575586): Wait for S SDK finalization to determine the final minSdkVersion.
+     */
+    @SdkSuppress(minSdkVersion = 31, codeName = "S")
+    public void testPasspointCapability() {
+        if (!WifiFeature.isWifiSupported(getContext())) {
+            // skip the test if WiFi is not supported
+            return;
+        }
+        PackageManager packageManager = mContext.getPackageManager();
+        assertTrue("Passpoint must be supported",
+                packageManager.hasSystemFeature(PackageManager.FEATURE_WIFI_PASSPOINT));
+    }
 }