From 6953d5951fed975d2569ec46bd544ce21e6860dc Mon Sep 17 00:00:00 2001 From: Tony Mantler Date: Tue, 19 Nov 2013 15:45:07 -0800 Subject: [PATCH] Null check service info b/11754422 Change-Id: Iae3c87c894eb3d16880768a3b8894e43d75a5878 --- src/com/android/email/provider/EmailProvider.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/com/android/email/provider/EmailProvider.java b/src/com/android/email/provider/EmailProvider.java index 1496295ee..25ccd739c 100644 --- a/src/com/android/email/provider/EmailProvider.java +++ b/src/com/android/email/provider/EmailProvider.java @@ -2895,7 +2895,9 @@ public class EmailProvider extends ContentProvider { 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;