From 908fac0b247deff27fee44297f892afdfbb086a5 Mon Sep 17 00:00:00 2001
From: Paul Westbrook <pwestbro@google.com>
Date: Fri, 16 Aug 2013 15:53:36 -0700
Subject: [PATCH] Fix NPE

Bug: 10292690
Change-Id: I34714a6a07bcaba3d20fdae32ee6b129c74c8a32
---
 .../android/email/provider/AttachmentProvider.java  | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/com/android/email/provider/AttachmentProvider.java b/src/com/android/email/provider/AttachmentProvider.java
index 4839c8927..c64fb4e4c 100644
--- a/src/com/android/email/provider/AttachmentProvider.java
+++ b/src/com/android/email/provider/AttachmentProvider.java
@@ -80,11 +80,14 @@ public class AttachmentProvider extends ContentProvider {
          * We use the cache dir as a temporary directory (since Android doesn't give us one) so
          * on startup we'll clean up any .tmp files from the last run.
          */
-        File[] files = getContext().getCacheDir().listFiles();
-        for (File file : files) {
-            String filename = file.getName();
-            if (filename.endsWith(".tmp") || filename.startsWith("thmb_")) {
-                file.delete();
+
+        final File[] files = getContext().getCacheDir().listFiles();
+        if (files != null) {
+            for (File file : files) {
+                final String filename = file.getName();
+                if (filename.endsWith(".tmp") || filename.startsWith("thmb_")) {
+                    file.delete();
+                }
             }
         }
         return true;