commit afa03ab884cba0c5032f6a73ea0d7333a0bcec6e
author Warren Ochibobo <ochibobow@google.com> Mon May 19 06:51:38 2025 -0700
committer Warren Ochibobo <ochibobow@google.com> Mon May 19 06:53:34 2025 -0700
tree 92d2a90da25078d48fb0059105514a79c6fa4526
parent eaa55f9072fc5f94d4c6f223c25768eff6ce7758

Increased the number of adding a role holder retries to 12.

This CL also contains an extra check on whether the role has been assigned or not.

Bug: 383915983
Bug: 383126661
Test: atest DeviceLockUnitTests
Flag: EXEMPT bugfix

Change-Id: Ib28973ca8141480a13028b41084af3022d769925

service/java/com/android/server/devicelock/DeviceLockServiceImpl.java

diff --git a/service/java/com/android/server/devicelock/DeviceLockServiceImpl.java b/service/java/com/android/server/devicelock/DeviceLockServiceImpl.java
index ee384df..084f3fb 100644
--- a/service/java/com/android/server/devicelock/DeviceLockServiceImpl.java
+++ b/service/java/com/android/server/devicelock/DeviceLockServiceImpl.java
@@ -95,7 +95,7 @@
             "com.android.devicelock.action.KEEPALIVE";
 
     // Workaround for timeout while adding the kiosk app as role holder for financing.
-    private static final int MAX_ADD_ROLE_HOLDER_TRIES = 4;
+    private static final int MAX_ADD_ROLE_HOLDER_TRIES = 12;
 
     private final Context mContext;
     private final ExecutorService mExecutorService;
@@ -765,6 +765,16 @@
                     if (accepted || remainingTries == 1) {
                         reportResult(accepted, identity, remoteCallback);
                     } else {
+                        // Check if the role is already added.
+                        if (mRoleManager.getRoleHoldersAsUser(
+                                RoleManager.ROLE_FINANCED_DEVICE_KIOSK, userHandle).
+                                contains(packageName)) {
+                            Slog.w(TAG, "Role (" +
+                                RoleManager.ROLE_FINANCED_DEVICE_KIOSK + ") already added for "
+                                + packageName);
+                            return;
+                        }
+
                         final int retryNumber = MAX_ADD_ROLE_HOLDER_TRIES - remainingTries + 1;
                         Slog.w(TAG, "Retrying adding financed device role to kiosk app (retry "
                                 + retryNumber + ")");