commit b8335a6ea4df7641233cb1e28a73a02264367d94
author Marc Blank <mblank@google.com> Mon May 14 12:09:20 2012 -0700
committer Marc Blank <mblank@google.com> Mon May 14 12:09:20 2012 -0700
tree e4d62411a53964ab7250d39f3466b906d99287fd
parent 53278235bb6efb043019e1131bb88054cef2e1c9

Prevent NPE with top-level user-generic mailboxes

Bug: 6485349
Change-Id: I64693c024b36076e4fc4a249ba1d80364965b188

exchange2/src/com/android/exchange/adapter/FolderSyncParser.java

diff --git a/exchange2/src/com/android/exchange/adapter/FolderSyncParser.java b/exchange2/src/com/android/exchange/adapter/FolderSyncParser.java
index 3971e21..2c213a4 100644
--- a/exchange2/src/com/android/exchange/adapter/FolderSyncParser.java
+++ b/exchange2/src/com/android/exchange/adapter/FolderSyncParser.java
@@ -426,11 +426,14 @@
         // Mailbox, so we'll have to query the database
         if (parent == null) {
             mBindArguments[0] = Long.toString(mAccount.mId);
-            mBindArguments[1] = mailbox.mParentServerId;
-            long parentId = Utility.getFirstRowInt(mContext, Mailbox.CONTENT_URI,
-                    EmailContent.ID_PROJECTION,
-                    MailboxColumns.ACCOUNT_KEY + "=? AND " + MailboxColumns.SERVER_ID + "=?",
-                    mBindArguments, null, EmailContent.ID_PROJECTION_COLUMN, -1);
+            long parentId = -1;
+            if (mailbox.mParentServerId != null) {
+                mBindArguments[1] = mailbox.mParentServerId;
+                parentId = Utility.getFirstRowInt(mContext, Mailbox.CONTENT_URI,
+                        EmailContent.ID_PROJECTION,
+                        MailboxColumns.ACCOUNT_KEY + "=? AND " + MailboxColumns.SERVER_ID + "=?",
+                        mBindArguments, null, EmailContent.ID_PROJECTION_COLUMN, -1);
+            }
             if (parentId != -1) {
                 // Get the parent from the database
                 parent = Mailbox.restoreMailboxWithId(mContext, parentId);