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

Commit 4a6c2a26 authored by Pavel Grafov's avatar Pavel Grafov
Browse files

Cleanup copy_account_with_retry_enabled 

Flag was rolled out in Android V.

Bug: 335663055
Test: TH
Flag: EXEMPT flag cleanup
Change-Id: I89f8327d9ac59fbe7a227e8a30865756538598a2
parent 2e8f6f01

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

+0 −10
Original line number Diff line number Diff line
@@ -182,16 +182,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
@@ -21893,7 +21893,6 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { 
            return;

        }













        if (Flags.copyAccountWithRetryEnabled()) {















        boolean copySucceeded = false;















        int retryAttemptsLeft = RETRY_COPY_ACCOUNT_ATTEMPTS;















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









@@ -21902,9 +21901,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {













                    copyAccount(targetUser, sourceUser, accountToMigrate, callerPackage);















            retryAttemptsLeft--;















        }













        } else {













            copyAccount(targetUser, sourceUser, accountToMigrate, callerPackage);













        }



























        if (!keepAccountMigrated) {















            removeAccount(accountToMigrate, sourceUserId);















        }