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

Commit c12e69a3 authored by Eran Messeri's avatar Eran Messeri Committed by android-build-merger
Browse files

Merge "Save password requirements on the right user" into pi-dev am: f0db8fe1 

am: 7c10001d

Change-Id: I517d4fca46080bea0ad083a54a6076cf893e0f1b
parents 3b155268 7c10001d

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

+10 −0
Original line number Diff line number Diff line
@@ -3945,6 +3945,7 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { 
            if (metrics.quality != quality) {

                metrics.quality = quality;

                updatePasswordValidityCheckpointLocked(userId, parent);

                saveSettingsLocked(userId);

            }

            maybeLogPasswordComplexitySet(who, userId, parent, metrics);

        }
@@ -4056,6 +4057,7 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { 
            if (metrics.length != length) {

                metrics.length = length;

                updatePasswordValidityCheckpointLocked(userId, parent);

                saveSettingsLocked(userId);

            }

            maybeLogPasswordComplexitySet(who, userId, parent, metrics);

        }
@@ -4080,6 +4082,7 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { 
            if (ap.passwordHistoryLength != length) {

                ap.passwordHistoryLength = length;

                updatePasswordValidityCheckpointLocked(userId, parent);

                saveSettingsLocked(userId);

            }

        }

        if (SecurityLog.isLoggingEnabled()) {
@@ -4281,6 +4284,7 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { 
            if (metrics.upperCase != length) {

                metrics.upperCase = length;

                updatePasswordValidityCheckpointLocked(userId, parent);

                saveSettingsLocked(userId);

            }

            maybeLogPasswordComplexitySet(who, userId, parent, metrics);

        }
@@ -4303,6 +4307,7 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { 
            if (metrics.lowerCase != length) {

                metrics.lowerCase = length;

                updatePasswordValidityCheckpointLocked(userId, parent);

                saveSettingsLocked(userId);

            }

            maybeLogPasswordComplexitySet(who, userId, parent, metrics);

        }
@@ -4328,6 +4333,7 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { 
            if (metrics.letters != length) {

                metrics.letters = length;

                updatePasswordValidityCheckpointLocked(userId, parent);

                saveSettingsLocked(userId);

            }

            maybeLogPasswordComplexitySet(who, userId, parent, metrics);

        }
@@ -4353,6 +4359,7 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { 
            if (metrics.numeric != length) {

                metrics.numeric = length;

                updatePasswordValidityCheckpointLocked(userId, parent);

                saveSettingsLocked(userId);

            }

            maybeLogPasswordComplexitySet(who, userId, parent, metrics);

        }
@@ -4378,6 +4385,7 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { 
            if (metrics.symbols != length) {

                ap.minimumPasswordMetrics.symbols = length;

                updatePasswordValidityCheckpointLocked(userId, parent);

                saveSettingsLocked(userId);

            }

            maybeLogPasswordComplexitySet(who, userId, parent, metrics);

        }
@@ -4403,6 +4411,7 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { 
            if (metrics.nonLetter != length) {

                ap.minimumPasswordMetrics.nonLetter = length;

                updatePasswordValidityCheckpointLocked(userId, parent);

                saveSettingsLocked(userId);

            }

            maybeLogPasswordComplexitySet(who, userId, parent, metrics);

        }
@@ -6088,6 +6097,7 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { 
            synchronized (getLockObject()) {

                policy.mFailedPasswordAttempts = 0;

                updatePasswordValidityCheckpointLocked(userId, /* parent */ false);

                saveSettingsLocked(userId);

                updatePasswordExpirationsLocked(userId);

                setExpirationAlarmCheckLocked(mContext, userId, /* parent */ false);

































services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerTest.java



+8
−1




























Original line number
Diff line number
Diff line








@@ -4259,7 +4259,14 @@ public class DevicePolicyManagerTest extends DpmTestBase {





























        // Drain ACTION_DEVICE_POLICY_MANAGER_STATE_CHANGED broadcasts as part of















        // reportPasswordChanged()













        verify(mContext.spiedContext, times(3)).sendBroadcastAsUser(













        // This broadcast should be sent 4 times:













        // * Twice from calls to DevicePolicyManagerService.updatePasswordExpirationsLocked,













        //   once for each affected user, in DevicePolicyManagerService.reportPasswordChanged.













        // * Twice from calls to DevicePolicyManagerService.saveSettingsLocked













        //   in DevicePolicyManagerService.reportPasswordChanged, once with the userId













        //   the password change is relevant to and another with the credential owner of said













        //   userId.













        verify(mContext.spiedContext, times(4)).sendBroadcastAsUser(















                MockUtils.checkIntentAction(















                        DevicePolicyManager.ACTION_DEVICE_POLICY_MANAGER_STATE_CHANGED),















                MockUtils.checkUserHandle(userHandle));