Fix NPE in DevicePolicyManagerService that crashed SystemUI

Bug: 16857795
Change-Id: I6234f03c4ee31311af9f9c556b790594ee1a8b2f

diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
index 8e59844..fc96991 100644 (file)
--- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
+++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
@@ -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