commit 5f30e43ef9acf6cce0105890e6e72cce7f1901c6
author Sudheer Shanka <sudheersai@google.com> Wed Nov 09 13:08:59 2016 -0800
committer Sudheer Shanka <sudheersai@google.com> Wed Nov 09 14:57:37 2016 -0800
tree 399346ea7e8288d8e9d90398e6c6a35f538018bb
parent c54487abe41a9af562fb7327e2c9d569e9c8e9cd

Disable unsupported test items for DO as well.

Bug: 31330791
Test: manual
Change-Id: Icbf9310a6aaed4f6931e76056b943e6e919aecd8

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

diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/managedprovisioning/PolicyTransparencyTestListActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/managedprovisioning/PolicyTransparencyTestListActivity.java
index 34c7cc4..c5b4a93 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/managedprovisioning/PolicyTransparencyTestListActivity.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/managedprovisioning/PolicyTransparencyTestListActivity.java
@@ -122,8 +122,8 @@
     private void addTestsToAdapter(final ArrayTestListAdapter adapter) {
         for (String restriction : UserRestrictions.getUserRestrictions()) {
             final Intent intent = UserRestrictions.getUserRestrictionTestIntent(this, restriction);
-            if (!UserRestrictions.isRestrictionValid(this, restriction) &&
-                    !mIsDeviceOwner && !UserRestrictions.isValidForPO(restriction)) {
+            if (!UserRestrictions.isRestrictionValid(this, restriction) ||
+                    (!mIsDeviceOwner && !UserRestrictions.isValidForPO(restriction))) {
                 continue;
             }
             final String title = UserRestrictions.getRestrictionLabel(this, restriction);
@@ -135,8 +135,8 @@
         for (Pair<Intent, Integer> policy : POLICIES) {
             final Intent intent = policy.first;
             String test = intent.getStringExtra(PolicyTransparencyTestActivity.EXTRA_TEST);
-            if (!isPolicyValid(test) &&
-                    !mIsDeviceOwner && !ALSO_VALID_FOR_PO.contains(test)) {
+            if (!isPolicyValid(test) ||
+                    (!mIsDeviceOwner && !ALSO_VALID_FOR_PO.contains(test))) {
                 continue;
             }
             final String title = getString(policy.second);
@@ -191,4 +191,4 @@
                 : CommandReceiverActivity.COMMAND_PROFILE_OWNER_CLEAR_POLICIES);
         startActivity(intent);
     }
-}
\ No newline at end of file
+}