am 5663e9c2: Merge "Fix folder NPE in DrawerItem" into jb-ub-mail-ur9
* commit '5663e9c2adcddd43a01429cac018c77aa86428a2':
Fix folder NPE in DrawerItem
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;