commit 04fc6752bb7dbfb7f0db2f6897583c541d0c60c9
author Nancy Chen <nancychen@google.com> Fri Jul 17 16:50:53 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Jul 17 16:50:53 2015 +0000
tree ea93b69f1d8d61fb8901437d3ef43f941c86458b
parent e266deb47e1bea5cf3662ceaf2d2409a773682b0
parent 1fba5d21e59faf3cb68dae7492bbfd57b3c0f9a3

am 1fba5d21: Merge "Fix crash when deleting voicemail." into mnc-dev

* commit '1fba5d21e59faf3cb68dae7492bbfd57b3c0f9a3':
  Fix crash when deleting voicemail.

src/com/android/phone/vvm/omtp/fetch/VoicemailFetchedCallback.java

diff --git a/src/com/android/phone/vvm/omtp/fetch/VoicemailFetchedCallback.java b/src/com/android/phone/vvm/omtp/fetch/VoicemailFetchedCallback.java
index bf5befd..eb6a175 100644
--- a/src/com/android/phone/vvm/omtp/fetch/VoicemailFetchedCallback.java
+++ b/src/com/android/phone/vvm/omtp/fetch/VoicemailFetchedCallback.java
@@ -61,7 +61,8 @@
                 outputStream.write(inputBytes);
             }
         } catch (IOException e) {
-            Log.e(TAG, "Error writing to file: ", e);
+            Log.w(TAG, String.format("File not found for %s", mUri));
+            return;
         } finally {
             IoUtils.closeQuietly(outputStream);
         }

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 1d20dbd..d68a36b 100644
--- a/src/com/android/phone/vvm/omtp/imap/ImapHelper.java
+++ b/src/com/android/phone/vvm/omtp/imap/ImapHelper.java
@@ -194,6 +194,11 @@
             }
             message = mFolder.getMessage(uid);
             VoicemailPayload voicemailPayload = fetchVoicemailPayload(message);
+
+            if (voicemailPayload == null) {
+                return false;
+            }
+
             callback.setVoicemailContent(voicemailPayload);
             return true;
         } catch (MessagingException e) {