Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Adrian Roos
2014-08-07 14:06:46 +00:00
committed by Android (Google) Code Review
parent a909b28a13 b8b4774e61
commit 5f2220df7f
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
View File

@@ -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