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

Commit 68c01cb6 authored by Adrian Roos's avatar Adrian Roos Committed by Android Git Automerger
Browse files

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

* commit 'c23b9298ad3544aba73a426c47e84988c709aaeb':
  Fix NPE in DevicePolicyManagerService that crashed SystemUI
parents 2531b787 5f2220df

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