commit 59e87fab8d90ed97a8fc4ee62f39ba894b4c7dbb
author Jay Shrauner <shrauner@google.com> Fri Jun 20 19:23:33 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jun 20 02:09:17 2014 +0000
tree 30f6ef4a80cc1dcff7ee561aaf2b113b73129f99
parent f5952f93f5bf11a99602d4f4d5e60444eae67487
parent f4b85896898ab862ea2c94fc147df363a78df14c

Merge "Fix NPE when mPolicy is unset" into ub-mail-master

src/com/android/exchange/eas/EasProvision.java

diff --git a/src/com/android/exchange/eas/EasProvision.java b/src/com/android/exchange/eas/EasProvision.java
index 2ee4db6..656a668 100644
--- a/src/com/android/exchange/eas/EasProvision.java
+++ b/src/com/android/exchange/eas/EasProvision.java
@@ -181,7 +181,9 @@
         //storeMaxAttachmentSize(mPolicy.mMaxAttachmentSize);
 
         // Apply the policies (that we support) with the temporary key.
-        mPolicy.mProtocolPoliciesUnsupported = null;
+        if (mPolicy != null) {
+            mPolicy.mProtocolPoliciesUnsupported = null;
+        }
         PolicyServiceProxy.setAccountPolicy(mContext, accountId, mPolicy, null);
         if (!PolicyServiceProxy.isActive(mContext, mPolicy)) {
             return false;