commit 4e2ec8c0e40e24e0cfb61f804276223a97ddb92f
author Marc Blank <mblank@google.com> Thu Jul 07 08:33:33 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jul 07 08:33:33 2011 -0700
tree 5d8379dfbf5a3cef8d95b60bcde29c9c06a1935c
parent 55c8432b7d7e183cffdcf441b71a04c2d301d96c
parent 9b243f9a4581a63c6369d0f5a4f695edf2e90e38

Merge "Register replied/forwarded changes to provider"

src/com/android/exchange/EasSyncService.java

diff --git a/src/com/android/exchange/EasSyncService.java b/src/com/android/exchange/EasSyncService.java
index a3d94bf..0772d94 100644
--- a/src/com/android/exchange/EasSyncService.java
+++ b/src/com/android/exchange/EasSyncService.java
@@ -1719,7 +1719,7 @@
                 String key = mAccount.mSecuritySyncKey;
                 if (!TextUtils.isEmpty(key)) {
                     Policy policy = Policy.restorePolicyWithId(mContext, mAccount.mPolicyKey);
-                    if (!SecurityPolicyDelegate.isActive(mContext, policy)) {
+                    if ((policy != null) && !SecurityPolicyDelegate.isActive(mContext, policy)) {
                         resetSecurityPolicies();
                     }
                 }
@@ -2381,7 +2381,7 @@
 
         // Do checks to address historical policy sets.
         Policy policy = Policy.restorePolicyWithId(mContext, mAccount.mPolicyKey);
-        if (policy.mRequireEncryptionExternal) {
+        if ((policy != null) && policy.mRequireEncryptionExternal) {
             // External storage encryption is not supported at this time. In a previous release,
             // prior to the system supporting true removable storage on Honeycomb, we accepted
             // this since we emulated external storage on partitions that could be encrypted.