Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cbff16e5 authored by Pavel Grafov's avatar Pavel Grafov Committed by Android (Google) Code Review
Browse files

Merge "Cleanup copy_account_with_retry_enabled" into main

parents b384461f 4a6c2a26

core/java/android/app/admin/flags/flags.aconfig

+0 −10
Original line number Diff line number Diff line
@@ -238,16 +238,6 @@ flag { 
  bug: "322777918"

}



flag {

  name: "copy_account_with_retry_enabled"

  namespace: "enterprise"

  description: "Retry copy and remove account from personal to work profile in case of failure"

  bug: "329424312"

  metadata {

      purpose: PURPOSE_BUGFIX

  }

}



flag {

  name: "disallow_user_control_stopped_state_fix"

  namespace: "enterprise"

services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java

+8 −11
Original line number Diff line number Diff line
@@ -21867,7 +21867,6 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { 
            return;

        }













        if (Flags.copyAccountWithRetryEnabled()) {















        boolean copySucceeded = false;















        int retryAttemptsLeft = RETRY_COPY_ACCOUNT_ATTEMPTS;















        while (!copySucceeded && (retryAttemptsLeft > 0)) {









@@ -21876,9 +21875,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {













                    copyAccount(targetUser, sourceUser, accountToMigrate, callerPackage);















            retryAttemptsLeft--;















        }













        } else {













            copyAccount(targetUser, sourceUser, accountToMigrate, callerPackage);













        }



























        if (!keepAccountMigrated) {















            removeAccount(accountToMigrate, sourceUserId);















        }