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

Commit 04fadaad authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Fix testScreenCaptureDisabled" into rvc-dev am: 20905ec0 

Change-Id: I509b6d1568e2cba4d54a218a63509a6e9ffee418
parents 04a79624 20905ec0

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

+15 −13
Original line number Original line Diff line number Diff line
@@ -4674,6 +4674,7 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { 
            return getUserDataUnchecked(userHandle).mAdminList;

            return getUserDataUnchecked(userHandle).mAdminList;

        }

        }

        ArrayList<ActiveAdmin> admins = new ArrayList<>();

        ArrayList<ActiveAdmin> admins = new ArrayList<>();

        mInjector.binderWithCleanCallingIdentity(() -> {

            for (UserInfo userInfo : mUserManager.getProfiles(userHandle)) {

            for (UserInfo userInfo : mUserManager.getProfiles(userHandle)) {

                DevicePolicyData policy = getUserDataUnchecked(userInfo.id);

                DevicePolicyData policy = getUserDataUnchecked(userInfo.id);

                if (userInfo.id == userHandle) {

                if (userInfo.id == userHandle) {
@@ -4690,6 +4691,7 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { 
                    Slog.w(LOG_TAG, "Unknown user type: " + userInfo);

                    Slog.w(LOG_TAG, "Unknown user type: " + userInfo);

                }

                }

            }

            }

        });

        return admins;

        return admins;

    }

    }