commit 7e21488d766f14593d51de6f8aa4b6218eac7e2b
author Anthony Lee <anthonylee@google.com> Mon Apr 28 22:33:06 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Apr 28 22:33:07 2014 +0000
tree 84255148a6b9d115c9c57d2325be424680837c05
parent 9583cd05d677fb8097e09e8895c4108445e82d4f
parent fb91ff817ecec840f9bd5285116f33794f1a65ef

Merge "Move from custom projections to ones in EmailContent.Body already." into ub-mail-master

src/com/android/exchange/Exchange.java

diff --git a/src/com/android/exchange/Exchange.java b/src/com/android/exchange/Exchange.java
index 2b2a468..c18c86c 100644
--- a/src/com/android/exchange/Exchange.java
+++ b/src/com/android/exchange/Exchange.java
@@ -31,7 +31,12 @@
     public void onCreate() {
         super.onCreate();
         EmailContent.init(this);
-        getContentResolver().call(EmailContent.CONTENT_URI, MailboxUtilities.FIX_PARENT_KEYS_METHOD,
-                "", null);
+        try {
+            getContentResolver().call(EmailContent.CONTENT_URI,
+                    MailboxUtilities.FIX_PARENT_KEYS_METHOD, "", null);
+        } catch (IllegalArgumentException e) {
+            // If there is no Email provider (which happens if eg the
+            // Email app is disabled), ignore.
+        }
     }
 }