Merge "Add calendar sync checkbox to account settings screen"
diff --git a/EXCHANGE.readme b/EXCHANGE.readme
new file mode 100644
index 0000000..d637372
--- /dev/null
+++ b/EXCHANGE.readme
@@ -0,0 +1,11 @@
+Exchange support in the Email application can be removed. In order to do so,
+run the remove-exchange-support.sh script and rebuild the application. In case
+the script doesn't work, here's how to do it manually.
+
+1. Remove everything under src/com/android/exchange/ and
+ tests/src/com/android/exchange/.
+2. Check all the *.xml and *.java files, and remove all the lines surrounded by
+ EXCHANGE-REMOVE-SECTION-START and EXCHANGE-REMOVE-SECTION-END.
+3. Check all the *.java files and remove all imports from com.android.exchange
+ and its subpackages.
+
diff --git a/res/drawable-mdpi/icon.png b/res/drawable-mdpi/icon.png
index 590ed70..e874589 100644
--- a/res/drawable-mdpi/icon.png
+++ b/res/drawable-mdpi/icon.png
Binary files differ
diff --git a/src/com/android/exchange/SyncManager.java b/src/com/android/exchange/SyncManager.java
index c840fce..58f976d 100644
--- a/src/com/android/exchange/SyncManager.java
+++ b/src/com/android/exchange/SyncManager.java
@@ -1854,6 +1854,7 @@
break;
case AbstractSyncService.EXIT_IO_ERROR:
Mailbox m = Mailbox.restoreMailboxWithId(INSTANCE, mailboxId);
+ if (m == null) return;
if (syncError != null) {
syncError.escalate();
INSTANCE.log(m.mDisplayName + " held for " + syncError.holdDelay + "ms");
