commit bc83dec6da0b6d326c00ff531bbe8447b62abbb9
author Alice Yang <alice@google.com> Tue Sep 03 21:57:20 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Sep 03 21:57:20 2013 +0000
tree ae93f42d3abdb01c426bef59adfafae068a57e2d
parent 784f9e928f0b1e38f6cc94d7f201258ef573f40b
parent 4f6e5f4e1e842f3f0552b673626c6d4bceaf1641

Merge "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 8588163..0269b56 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 != null && mFolder.parent != Uri.EMPTY) {
+                    && 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();