diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-08-18 02:23:41 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-08-18 02:23:41 +0000 |
commit | f1430566494dc382e111465d830b1ef6c788c2db (patch) | |
tree | 3ada8d0b5948992c5f9ba414fbcffb28cc17982b | |
parent | 443004403bd00db70bfb1c7ddd30fde3a90cef80 (diff) | |
parent | 6119004cdd53d3f2143fd1687d072a310700792c (diff) | |
download | cts-android13-d1-s3-release.tar.gz |
Merge cherrypicks of [19625643] into tm-d1-release.android-13.0.0_r15android-13.0.0_r14android-13.0.0_r13android-13.0.0_r11android13-d1-s3-releaseandroid13-d1-release
Change-Id: I89ec16146d3dbbabcfc9fd19a6a9ead8260050e4
-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 42ad218ffb1..d6564ff8331 100644 --- a/apps/CtsVerifier/src/com/android/cts/verifier/managedprovisioning/ByodFlowTestActivity.java +++ b/apps/CtsVerifier/src/com/android/cts/verifier/managedprovisioning/ByodFlowTestActivity.java @@ -118,7 +118,7 @@ public class ByodFlowTestActivity extends DialogTestListActivity { private TestListItem mPrimaryLocationWhenWorkDisabledTest; //private DialogTestListItem mSelectWorkChallenge; private DialogTestListItem mConfirmWorkCredentials; - private DialogTestListItem mPatternWorkChallenge; + //private DialogTestListItem mPatternWorkChallenge; private DialogTestListItem mParentProfilePassword; private DialogTestListItem mPersonalRingtonesTest; private TestListItem mVpnTest; @@ -297,12 +297,13 @@ public class ByodFlowTestActivity extends DialogTestListActivity { "BYOD_ConfirmWorkCredentials", R.string.provisioning_byod_confirm_work_credentials_description, new Intent(Intent.ACTION_MAIN).addCategory(Intent.CATEGORY_HOME)); - + /* Disable due to b/242477777 mPatternWorkChallenge = new DialogTestListItem(this, R.string.provisioning_byod_pattern_work_challenge, "BYOD_PatternWorkChallenge", R.string.provisioning_byod_pattern_work_challenge_description, new Intent(ByodHelperActivity.ACTION_TEST_PATTERN_WORK_CHALLENGE)); + */ mWiFiDataUsageSettingsVisibleTest = new DialogTestListItem(this, R.string.provisioning_byod_wifi_data_usage_settings, @@ -564,7 +565,7 @@ public class ByodFlowTestActivity extends DialogTestListActivity { //adapter.add(mSelectWorkChallenge); if (!getPackageManager().hasSystemFeature(PackageManager.FEATURE_AUTOMOTIVE)) { adapter.add(mConfirmWorkCredentials); - adapter.add(mPatternWorkChallenge); + // adapter.add(mPatternWorkChallenge); } adapter.add(mRecentsTest); adapter.add(mOrganizationInfoTest); |