commit d696019364860f9ca3ef1d26031b1fca61042eaf
author Yu Ping Hu <yph@google.com> Thu Jun 20 15:03:58 2013 -0700
committer Yu Ping Hu <yph@google.com> Thu Jun 20 15:03:58 2013 -0700
tree d15d900cdf3ba188378396b2038439cf4f5fe298
parent b6d958e231511471239770e3f21df56ba4c3069b

Fix some crashes.

A DB query had an extra ")", and a null check was missing.

Change-Id: I2f74510f870aad341d6bdd303ba7c2621025791f

src/com/android/exchange/service/EasPingSyncHandler.java

diff --git a/src/com/android/exchange/service/EasPingSyncHandler.java b/src/com/android/exchange/service/EasPingSyncHandler.java
index 4841ff4..5144df7 100644
--- a/src/com/android/exchange/service/EasPingSyncHandler.java
+++ b/src/com/android/exchange/service/EasPingSyncHandler.java
@@ -37,7 +37,7 @@
 
     private class PingTask extends AsyncTask<Void, Void, Void> {
         private static final String AND_FREQUENCY_PUSH = " AND " + MailboxColumns.SYNC_INTERVAL +
-                '=' + Mailbox.CHECK_INTERVAL_PUSH + ")";
+                '=' + Mailbox.CHECK_INTERVAL_PUSH;
         private static final String WHERE_ACCOUNT_KEY_AND_SERVER_ID =
                 MailboxColumns.ACCOUNT_KEY + "=? and " + MailboxColumns.SERVER_ID + "=?";
 

src/com/android/exchange/service/EmailSyncAdapterService.java

diff --git a/src/com/android/exchange/service/EmailSyncAdapterService.java b/src/com/android/exchange/service/EmailSyncAdapterService.java
index 9b28caa..e752162 100644
--- a/src/com/android/exchange/service/EmailSyncAdapterService.java
+++ b/src/com/android/exchange/service/EmailSyncAdapterService.java
@@ -497,7 +497,7 @@
             } else {
                 // Sync the mailbox that was explicitly requested.
                 final Mailbox mailbox = Mailbox.restoreMailboxWithId(context, mailboxId);
-                if (mailbox.mType == Mailbox.TYPE_OUTBOX) {
+                if (mailbox != null && mailbox.mType == Mailbox.TYPE_OUTBOX) {
                     final EasOutboxSyncHandler outboxSyncHandler =
                             new EasOutboxSyncHandler(context, account, mailbox);
                     outboxSyncHandler.performSync();