diff options
| -rw-r--r-- | src/com/android/email/SecurityPolicy.java | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/com/android/email/SecurityPolicy.java b/src/com/android/email/SecurityPolicy.java index de1a04eaf..db725b819 100644 --- a/src/com/android/email/SecurityPolicy.java +++ b/src/com/android/email/SecurityPolicy.java @@ -586,6 +586,10 @@ public class SecurityPolicy { public void setAccountPolicy(long accountId, Policy policy, String securityKey, boolean notify) { Account account = Account.restoreAccountWithId(mContext, accountId); + // In case the account has been deleted, just return + if (account == null) { + return; + } Policy oldPolicy = null; if (account.mPolicyKey > 0) { oldPolicy = Policy.restorePolicyWithId(mContext, account.mPolicyKey); @@ -791,6 +795,9 @@ public class SecurityPolicy { boolean result = false; Cursor c = context.getContentResolver().query(Policy.CONTENT_URI, Policy.ID_PROJECTION, HAS_PASSWORD_EXPIRATION, null, null); + if (c == null) { + return false; + } try { while (c.moveToNext()) { long policyId = c.getLong(Policy.ID_PROJECTION_COLUMN); |