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

Commit 5f2220df authored by Adrian Roos's avatar Adrian Roos Committed by Android (Google) Code Review
Browse files

Merge "Fix NPE in DevicePolicyManagerService that crashed SystemUI" into lmp-dev

parents a909b28a b8b4774e

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

+2 −1
Original line number Diff line number Diff line
@@ -2850,7 +2850,8 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { 
                if (mHasFeature) {

                    ActiveAdmin strictestAdmin =

                            getAdminWithMinimumFailedPasswordsForWipeLocked(userHandle);

                    int max = strictestAdmin.maximumFailedPasswordsForWipe;

                    int max = strictestAdmin != null

                            ? strictestAdmin.maximumFailedPasswordsForWipe : 0;

                    if (max > 0 && policy.mFailedPasswordAttempts >= max) {

                        // Wipe the user/profile associated with the policy that was violated. This

                        // is not necessarily calling user: if the policy that fired was from a