commit 849b4c865f8d3bf6a1a06a0294c747676847e837
author Treehugger Robot <treehugger-gerrit@google.com> Sat Feb 18 08:28:19 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Sat Feb 18 08:28:19 2023 +0000
tree e3fb4b27ff816bc30985f3b44fe61ce18a471a38
parent e75f143d9a65dee7da41ef41f051c455ab2db567
parent 85adacfbd45e813f29fc3a8f95785fee5b772a8c

Merge "Skip wifi sharing restriction test if DPP not supported" into android13-tests-dev

apps/CtsVerifier/src/com/android/cts/verifier/managedprovisioning/WifiLockdownTestActivity.java

diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/managedprovisioning/WifiLockdownTestActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/managedprovisioning/WifiLockdownTestActivity.java
index 26be321..e258c13 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/managedprovisioning/WifiLockdownTestActivity.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/managedprovisioning/WifiLockdownTestActivity.java
@@ -57,6 +57,7 @@
     private static final String DISALLOW_SHARING_ADMIN_CONFIGURED_WIFI_ID =
             "DISALLOW_SHARING_ADMIN_CONFIGURED_WIFI";
 
+    private WifiManager mWifiManager;
     private WifiConfigCreator mConfigCreator;
     private ButtonInfo[] mSwitchLockdownOffButtonInfos;
     private ButtonInfo[] mSwitchLockdownOnButtonInfos;
@@ -64,9 +65,9 @@
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        WifiManager wifiManager = TestAppSystemServiceFactory.getWifiManager(this,
+        mWifiManager = TestAppSystemServiceFactory.getWifiManager(this,
                 DeviceAdminTestReceiver.class);
-        mConfigCreator = new WifiConfigCreator(this, wifiManager);
+        mConfigCreator = new WifiConfigCreator(this, mWifiManager);
         setContentView(R.layout.wifi_lockdown);
         setInfoResources(R.string.device_owner_wifi_lockdown_test,
                 R.string.device_owner_wifi_lockdown_info, 0);
@@ -159,23 +160,27 @@
                 R.string.device_owner_wifi_config_unlocked_removal_test,
                 R.string.device_owner_wifi_config_unlocked_removal_test_info,
                 mSwitchLockdownOffButtonInfos));
-        adapter.add(Utils.createInteractiveTestItem(this,
-                DISALLOW_SHARING_ADMIN_CONFIGURED_WIFI_ID,
-                R.string.device_owner_disallow_sharing_admin_configure_wifi,
-                R.string.device_owner_disallow_sharing_admin_configure_wifi_info,
-                new ButtonInfo[] {
+
+        boolean isDppSupported = mWifiManager.isEasyConnectSupported();
+        if (isDppSupported) {
+            adapter.add(Utils.createInteractiveTestItem(this,
+                    DISALLOW_SHARING_ADMIN_CONFIGURED_WIFI_ID,
+                    R.string.device_owner_disallow_sharing_admin_configure_wifi,
+                    R.string.device_owner_disallow_sharing_admin_configure_wifi_info,
+                    new ButtonInfo[] {
                         new ButtonInfo(
                                 R.string.device_owner_user_restriction_set,
                                 CommandReceiverActivity.createSetCurrentUserRestrictionIntent(
-                                        UserManager.DISALLOW_SHARING_ADMIN_CONFIGURED_WIFI, true)),
+                                    UserManager.DISALLOW_SHARING_ADMIN_CONFIGURED_WIFI, true)),
                         new ButtonInfo(
                                 R.string.device_owner_settings_go,
                                 new Intent(Settings.ACTION_WIFI_SETTINGS)),
                         new ButtonInfo(
                                 R.string.device_owner_user_restriction_unset,
                                 CommandReceiverActivity.createSetCurrentUserRestrictionIntent(
-                                        UserManager.DISALLOW_SHARING_ADMIN_CONFIGURED_WIFI, false))
-                }));
+                                    UserManager.DISALLOW_SHARING_ADMIN_CONFIGURED_WIFI, false))
+                    }));
+        }
     }
 
     private int convertKeyManagement(int radioButtonId) {