diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-06-14 00:40:59 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-06-14 00:40:59 +0000 |
| commit | 4986c737e21b57a0545a4ba4f63be02e26f09243 (patch) | |
| tree | c54abe44130d8cd5cbd0ed788ee9fddad631adea | |
| parent | 081f27783ee00b650f115cf207191c16d56087e2 (diff) | |
| parent | f07938b2067fa2786052278c459f7b62e037151c (diff) | |
| download | ManagedProvisioning-android13-qpr3-s10-release.tar.gz | |
Merge cherrypicks of ['googleplex-android-review.googlesource.com/23260864'] into tm-qpr3-release.android-13.0.0_r83android-13.0.0_r79android-13.0.0_r78android-13.0.0_r77android-13.0.0_r76android-13.0.0_r75android-13.0.0_r71android-13.0.0_r70android-13.0.0_r69android-13.0.0_r68android-13.0.0_r67android13-qpr3-s9-releaseandroid13-qpr3-s8-releaseandroid13-qpr3-s7-releaseandroid13-qpr3-s6-releaseandroid13-qpr3-s14-releaseandroid13-qpr3-s13-releaseandroid13-qpr3-s12-releaseandroid13-qpr3-s11-releaseandroid13-qpr3-s10-releaseandroid13-qpr3-release
Change-Id: Ic7760c949c72c439545d910f30cff3f664767b87
| -rw-r--r-- | src/com/android/managedprovisioning/provisioning/AdminIntegratedFlowPrepareActivity.java | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/com/android/managedprovisioning/provisioning/AdminIntegratedFlowPrepareActivity.java b/src/com/android/managedprovisioning/provisioning/AdminIntegratedFlowPrepareActivity.java index 330b64036..3a5f0b1e4 100644 --- a/src/com/android/managedprovisioning/provisioning/AdminIntegratedFlowPrepareActivity.java +++ b/src/com/android/managedprovisioning/provisioning/AdminIntegratedFlowPrepareActivity.java @@ -101,7 +101,12 @@ public class AdminIntegratedFlowPrepareActivity extends AbstractProvisioningActi @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() { |