commit 57ed82c357e3af38f613ae2131b6007f15b369c2
author Nancy Chen <nancychen@google.com> Mon Jun 08 11:47:03 2015 -0700
committer The Android Automerger <android-build@google.com> Mon Jun 08 14:14:33 2015 -0700
tree 1d27e6f8d5bfae89a97ddddbd620fc1fd5ff13e5
parent 286171b8616f123eb46bc5c0b36136c9ee290970

Check if mImapStore is null before attempting to open folder.

If the the port number for the carrier config is null or not a number,
mImapStore will not be initialized. This means that attempting to open
the ImapFolder will result in a NPE. Make a check first.

Bug: 21693619
Change-Id: Id1400ea41f916e26fed05db5e8343505f774e455

src/com/android/phone/vvm/omtp/imap/ImapHelper.java

diff --git a/src/com/android/phone/vvm/omtp/imap/ImapHelper.java b/src/com/android/phone/vvm/omtp/imap/ImapHelper.java
index 684e5f5..e23dd41 100644
--- a/src/com/android/phone/vvm/omtp/imap/ImapHelper.java
+++ b/src/com/android/phone/vvm/omtp/imap/ImapHelper.java
@@ -357,6 +357,9 @@
 
     private ImapFolder openImapFolder(String modeReadWrite) {
         try {
+            if (mImapStore == null) {
+                return null;
+            }
             ImapFolder folder = new ImapFolder(mImapStore, ImapConstants.INBOX);
             folder.open(modeReadWrite);
             return folder;