From ea56ccf6ddbbcd6cbbc000822328f2fad1d3ff98 Mon Sep 17 00:00:00 2001
From: Ben Komalo <benkomalo@google.com>
Date: Thu, 5 May 2011 11:19:30 -0700
Subject: [PATCH] Fix NPE on startup.

There is no invariant in the controller that the fragments it references
are non-null, so querying the fragment for state is not always valid.

Change-Id: I880053be4000260b03b54ed8741e646b01314e0d
---
 src/com/android/email/activity/UIControllerTwoPane.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/com/android/email/activity/UIControllerTwoPane.java b/src/com/android/email/activity/UIControllerTwoPane.java
index 93a08e4c0..9794e497c 100644
--- a/src/com/android/email/activity/UIControllerTwoPane.java
+++ b/src/com/android/email/activity/UIControllerTwoPane.java
@@ -487,7 +487,9 @@ class UIControllerTwoPane implements
      * for the mailbox list. The two may be different.
      */
     public long getMessageListMailboxId() {
-        return mMessageListFragment.getMailboxId();
+        return (mMessageListFragment == null)
+                ? Mailbox.NO_MAILBOX
+                : mMessageListFragment.getMailboxId();
     }
 
     public long getMessageId() {