am 32786342: am 6953d595: Null check service info

* commit '32786342d9a297a29193d1c78f931ae064a4aedc':
  Null check service info
This commit is contained in:
Tony Mantler 2013-11-19 17:00:18 -08:00 committed by Android Git Automerger
commit 6b9c648105
1 changed files with 3 additions and 1 deletions

View File

@ -2896,7 +2896,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;