commit 7f8ce7c946b28c2d4ef238fa43d0cf101b53cb21
author Alice Yang <alice@google.com> Wed Sep 04 07:27:23 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Sep 04 07:27:23 2013 +0000
tree 3654a3d68f96b4de6654daaeab28f9f5b7cb497d
parent c77916eef7fadeca762e2c95752d61faea7d66b9
parent 1a7884b6e516220ace1ab74196df445fee10592b

Merge "Revert "Revert "NPE in TwoPaneController""" into jb-ub-mail-ur10

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

diff --git a/src/com/android/mail/ui/TwoPaneController.java b/src/com/android/mail/ui/TwoPaneController.java
index 0269b56..8588163 100644
--- a/src/com/android/mail/ui/TwoPaneController.java
+++ b/src/com/android/mail/ui/TwoPaneController.java
@@ -425,7 +425,7 @@
             // folder list has had a chance to initialize.
             final FolderListFragment folderList = getFolderListFragment();
             if (mode == ViewMode.CONVERSATION_LIST && folderList != null
-                    && mFolder.parent != Uri.EMPTY) {
+                    && mFolder != null && mFolder.parent != Uri.EMPTY) {
                 // If the user navigated via the left folders list into a child folder,
                 // back should take the user up to the parent folder's conversation list.
                 navigateUpFolderHierarchy();