commit 930b76c1e0f26be4305f6b160fdb4412cd00d2a3
author Jim Kaye <jameskaye@google.com> Wed Nov 30 09:08:34 2016 -0800
committer Jim Kaye <jameskaye@google.com> Wed Nov 30 09:08:34 2016 -0800
tree 1d6dea7991768bbdaacfb52485f3bce129e2656a
parent 8dd60225ebc1a013efc90a50dc32eb90a05ba86d

[CTS Verifier] Test "Wi-Fi Data Usage Settings Visible" only if the device has Wi-Fi

Make BYOD_WiFiDataUsageSettingsVisibleTest conditional on FEATURE_WIFI.

BUG: 33233811

Change-Id: I77bcbbb2b06d0b60e386ed7905ffd102d94cd861

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

diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/managedprovisioning/ByodFlowTestActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/managedprovisioning/ByodFlowTestActivity.java
index 6aacea8..9af0840 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/managedprovisioning/ByodFlowTestActivity.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/managedprovisioning/ByodFlowTestActivity.java
@@ -399,7 +399,6 @@
         adapter.add(mCredSettingsVisibleTest);
         adapter.add(mAppSettingsVisibleTest);
         adapter.add(mLocationSettingsVisibleTest);
-        adapter.add(mWiFiDataUsageSettingsVisibleTest);
         adapter.add(mCellularDataUsageSettingsVisibleTest);
         adapter.add(mPrintSettingsVisibleTest);
 
@@ -420,6 +419,10 @@
         adapter.add(mParentProfilePassword);
         adapter.add(mPolicyTransparencyTest);
 
+        if (getPackageManager().hasSystemFeature(PackageManager.FEATURE_WIFI)) {
+            adapter.add(mWiFiDataUsageSettingsVisibleTest);
+        }
+
         if (canResolveIntent(new Intent(Settings.ACTION_APPLICATION_SETTINGS))) {
             adapter.add(mDisallowAppsControlTest);
         }