diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-08-11 02:29:52 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-08-11 02:29:52 +0000 |
| commit | 443004403bd00db70bfb1c7ddd30fde3a90cef80 (patch) | |
| tree | 4be51fc988ca702ce994c863a3a0e48c39201479 | |
| parent | 533c33f0712eed5087ce0cfedbe02597d1fa9865 (diff) | |
| parent | 7f0c68c2f73d41de5eaecb11277754a7d3ca5fc4 (diff) | |
| download | cts-android13-d1-s2-release.tar.gz | |
Merge cherrypicks of [19536172] into tm-d1-release.android-13.0.0_r9android-13.0.0_r10android13-d1-s2-releaseandroid13-d1-s1-release
Change-Id: I4bcb05280ddeccd87343cda162b4c4bf0d813073
| -rw-r--r-- | apps/CtsVerifier/src/com/android/cts/verifier/managedprovisioning/ByodFlowTestActivity.java | 7 |
1 files changed, 4 insertions, 3 deletions
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 d23d43b78f2..42ad218ffb1 100644 --- a/apps/CtsVerifier/src/com/android/cts/verifier/managedprovisioning/ByodFlowTestActivity.java +++ b/apps/CtsVerifier/src/com/android/cts/verifier/managedprovisioning/ByodFlowTestActivity.java @@ -116,7 +116,7 @@ public class ByodFlowTestActivity extends DialogTestListActivity { private TestListItem mDisableLocationModeThroughMainSwitchTest; private TestListItem mDisableLocationModeThroughWorkSwitchTest; private TestListItem mPrimaryLocationWhenWorkDisabledTest; - private DialogTestListItem mSelectWorkChallenge; + //private DialogTestListItem mSelectWorkChallenge; private DialogTestListItem mConfirmWorkCredentials; private DialogTestListItem mPatternWorkChallenge; private DialogTestListItem mParentProfilePassword; @@ -472,12 +472,13 @@ public class ByodFlowTestActivity extends DialogTestListActivity { R.string.profile_owner_permission_lockdown_test_info, permissionCheckIntent); + /* Disable due to b/241498104 mSelectWorkChallenge = new DialogTestListItem(this, R.string.provisioning_byod_select_work_challenge, "BYOD_SelectWorkChallenge", R.string.provisioning_byod_select_work_challenge_description, new Intent(ByodHelperActivity.ACTION_TEST_SELECT_WORK_CHALLENGE)); - + */ mRecentsTest = TestListItem.newTest(this, R.string.provisioning_byod_recents, RecentsRedactionActivity.class.getName(), @@ -560,7 +561,7 @@ public class ByodFlowTestActivity extends DialogTestListActivity { adapter.add(mVpnTest); adapter.add(mAlwaysOnVpnSettingsTest); adapter.add(mTurnOffWorkFeaturesTest); - adapter.add(mSelectWorkChallenge); + //adapter.add(mSelectWorkChallenge); if (!getPackageManager().hasSystemFeature(PackageManager.FEATURE_AUTOMOTIVE)) { adapter.add(mConfirmWorkCredentials); adapter.add(mPatternWorkChallenge); |