commit a219d97d66b31d53f559e12b73924335349f88d8
author Alice Yang <alice@google.com> Wed Sep 04 00:30:28 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Wed Sep 04 00:30:28 2013 -0700
tree 1bee1b36401728bb4ca4c1f530b7b8d05f3508c6
parent c00056961faf2e2541f841107c0c6db6efed7e3f
parent bd698cd0f7689615bc53296342173c4817a0fb21

am bd698cd0: Merge "Revert "Revert "Prevent an NPE""" into jb-ub-mail-ur10

* commit 'bd698cd0f7689615bc53296342173c4817a0fb21':
  Revert "Revert "Prevent an NPE""

src/com/android/mail/ui/AbstractActivityController.java

diff --git a/src/com/android/mail/ui/AbstractActivityController.java b/src/com/android/mail/ui/AbstractActivityController.java
index 61b7bf2..ad30da0 100644
--- a/src/com/android/mail/ui/AbstractActivityController.java
+++ b/src/com/android/mail/ui/AbstractActivityController.java
@@ -4277,19 +4277,23 @@
                 // Now try to load our parent
                 final Folder folder;
 
-                final Cursor cursor = mContext.getContentResolver().query(mFolder.parent,
-                        UIProvider.FOLDERS_PROJECTION, null, null, null);
+                if (mFolder != null) {
+                    final Cursor cursor = mContext.getContentResolver().query(mFolder.parent,
+                            UIProvider.FOLDERS_PROJECTION, null, null, null);
 
-                if (cursor == null) {
-                    // We couldn't load the parent, so use the inbox
-                    folder = mInbox;
-                } else {
-                    try {
-                        cursor.moveToFirst();
-                        folder = new Folder(cursor);
-                    } finally {
-                        cursor.close();
+                    if (cursor == null) {
+                        // We couldn't load the parent, so use the inbox
+                        folder = mInbox;
+                    } else {
+                        try {
+                            cursor.moveToFirst();
+                            folder = new Folder(cursor);
+                        } finally {
+                            cursor.close();
+                        }
                     }
+                } else {
+                    folder = mInbox;
                 }
 
                 return folder;