commit 0d2890660ce68b0c49f434d6496fdc69f1b39dc6
author Andrew Sapperstein <asapperstein@google.com> Tue Feb 11 09:56:26 2014 -0800
committer Andrew Sapperstein <asapperstein@google.com> Tue Feb 11 09:56:26 2014 -0800
tree 815f8ceaaeb0d4c86192b6cb62287479114fb8f2
parent 7bb7630285b5919a4623ff5a522ec64f306fc75a

Fix pop crash. b/12968001.

Yet another "passing unicodeWrap null" bug.

Change-Id: I38a087e3b4b40a1a42b669e532b19cbf5f4184d2

src/com/android/mail/utils/AttachmentUtils.java

diff --git a/src/com/android/mail/utils/AttachmentUtils.java b/src/com/android/mail/utils/AttachmentUtils.java
index 9a3b3a7..85f5206 100644
--- a/src/com/android/mail/utils/AttachmentUtils.java
+++ b/src/com/android/mail/utils/AttachmentUtils.java
@@ -15,8 +15,6 @@
  */
 package com.android.mail.utils;
 
-import com.google.common.collect.ImmutableMap;
-
 import android.app.DownloadManager;
 import android.content.Context;
 import android.net.ConnectivityManager;
@@ -28,13 +26,14 @@
 
 import com.android.mail.R;
 import com.android.mail.providers.Attachment;
+import com.google.common.collect.ImmutableMap;
 
+import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
-import java.io.InputStream;
 import java.io.IOException;
-import java.io.File;
+import java.io.InputStream;
 import java.text.DecimalFormat;
 import java.text.SimpleDateFormat;
 import java.util.Date;
@@ -88,7 +87,7 @@
     public static String getDisplayType(final Context context, final Attachment attachment) {
         if ((attachment.flags & Attachment.FLAG_DUMMY_ATTACHMENT) != 0) {
             // This is a dummy attachment, display blank for type.
-            return null;
+            return "";
         }
 
         // try to get a friendly name for the exact mime type