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

Commit eea3ed20 authored by Andrew Scull's avatar Andrew Scull Committed by Adam Seaton
Browse files

resolve merge conflicts of ad4aa1ce to nyc-mr1-dev 

fix conflict in nyc-mr2-release
Change-Id: I97ef31536cd06495a08a3f94f81df2d1376186e0
(cherry picked from commit f806d65e)
parent 6422e8fb

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

+3 −3
Original line number Diff line number Diff line
@@ -2578,14 +2578,14 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { 
            // Ignore

        }



        // Generate a list of admins from the admin map

        policy.mAdminList.addAll(policy.mAdminMap.values());



        // Might need to upgrade the file by rewriting it

        if (needsRewrite) {

            saveSettingsLocked(userHandle);

        }



        // Generate a list of admins from the admin map

        policy.mAdminList.addAll(policy.mAdminMap.values());



        validatePasswordOwnerLocked(policy);

        updateMaximumTimeToLockLocked(userHandle);

        updateLockTaskPackagesLocked(policy.mLockTaskPackages, userHandle);