commit e286407580a25914a122480540a2f0be0affcde4
author Rohan Shah <shahrk@google.com> Tue Mar 19 14:02:23 2013 -0700
committer Rohan Shah <shahrk@google.com> Tue Mar 19 14:05:23 2013 -0700
tree 2d83cb16278c2c093fa7278293c49045bb5d2af5
parent 976b60a83728131cc2267442e080521473a4a674

Fix folder NPE in DrawerItem

Ensure folder/current folder are not null when
entering from a widget.

Bug: 8424375
Change-Id: I408fa0076959897606eeea5393f609180cad76a2

src/com/android/mail/adapter/DrawerItem.java

diff --git a/src/com/android/mail/adapter/DrawerItem.java b/src/com/android/mail/adapter/DrawerItem.java
index 84b6540..1e062f1 100644
--- a/src/com/android/mail/adapter/DrawerItem.java
+++ b/src/com/android/mail/adapter/DrawerItem.java
@@ -212,8 +212,12 @@
             case VIEW_HEADER :
                 // Headers are never highlighted
                 return false;
-            case VIEW_FOLDER :
-                return (mFolderType == currentType) && mFolder.uri.equals(currentFolder.uri);
+            case VIEW_FOLDER:
+                // True if folder types and URIs are the same
+                if (currentFolder != null && mFolder != null) {
+                    return (mFolderType == currentType) && mFolder.uri.equals(currentFolder.uri);
+                }
+                return false;
             case VIEW_ACCOUNT:
                 // Accounts are never highlighted
                 return false;