| commit | 7ce425c1472433b10d975d55ef67d562e7d4cb95 | [log] [tgz] |
|---|---|---|
| author | shreyacsingh <shreyacsingh@google.com> | Mon Mar 27 17:01:06 2023 +0000 |
| committer | android-t1 <android-t1@t2mobile.com> | Wed Aug 02 13:57:06 2023 +0800 |
| tree | ce030dadddd48247d622ad70867f27a9612ec397 | |
| parent | bc4a94b644d5da1d0602dbd995b58de2ace50d7f [diff] |
Remove factory-reset logic from post-suw syncauth Bug: 266906483 , Bug: 278691965 Test: Manual Dialog-before: https://drive.google.com/file/d/1uE02duXkFGG1G6qu4foNgGKGLgQhIWoO/view?usp=sharing Dialog-after: https://drive.google.com/file/d/1UM7w-ClnnhWi3aVokhXrZk42e8gdbQSI/view?usp=sharing (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:b16f50a817da9e48d0f3c572de832093362b46e2) (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:729cdfd06d942af93953f1bbcfe74a4bf380bbf2) Merged-In: I0da6a2eaad20f628973ca3a080602992dfaeb63e Change-Id: I0da6a2eaad20f628973ca3a080602992dfaeb63e
diff --git a/src/com/android/managedprovisioning/provisioning/AdminIntegratedFlowPrepareActivity.java b/src/com/android/managedprovisioning/provisioning/AdminIntegratedFlowPrepareActivity.java index 330b640..3a5f0b1 100644 --- a/src/com/android/managedprovisioning/provisioning/AdminIntegratedFlowPrepareActivity.java +++ b/src/com/android/managedprovisioning/provisioning/AdminIntegratedFlowPrepareActivity.java
@@ -101,7 +101,12 @@ @Override protected void decideCancelProvisioningDialog() { - showCancelProvisioningDialog(/* resetRequired = */true); + if (getUtils().isDeviceOwnerAction(mParams.provisioningAction) + || getUtils().isOrganizationOwnedAllowed(mParams)) { + showCancelProvisioningDialog(/* resetRequired= */ true); + } else { + showCancelProvisioningDialog(/* resetRequired= */ false); + } } private void initializeUi() {