commit 6953d5951fed975d2569ec46bd544ce21e6860dc
author Tony Mantler <nicoya@google.com> Tue Nov 19 15:45:07 2013 -0800
committer Tony Mantler <nicoya@google.com> Tue Nov 19 15:45:07 2013 -0800
tree 2b4ef4b5b40a581533305766865de16ca3e27a64
parent 4b629cf25804fd74712b0f7acce1c2e59135b9bf

Null check service info

b/11754422

Change-Id: Iae3c87c894eb3d16880768a3b8894e43d75a5878

src/com/android/email/provider/EmailProvider.java

diff --git a/src/com/android/email/provider/EmailProvider.java b/src/com/android/email/provider/EmailProvider.java
index 1496295..25ccd73 100644
--- a/src/com/android/email/provider/EmailProvider.java
+++ b/src/com/android/email/provider/EmailProvider.java
@@ -2895,7 +2895,9 @@
             caps |= UIProvider.FolderCapabilities.IS_VIRTUAL;
         }
 
-        if (!info.offerMoveTo) {
+        // If we don't know the protocol or the protocol doesn't support it, don't allow moving
+        // messages
+        if (info == null || !info.offerMoveTo) {
             caps &= ~UIProvider.FolderCapabilities.CAN_ACCEPT_MOVED_MESSAGES &
                     ~UIProvider.FolderCapabilities.ALLOWS_REMOVE_CONVERSATION &
                     ~UIProvider.FolderCapabilities.ALLOWS_MOVE_TO_INBOX;