summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPaul Westbrook <pwestbro@google.com>2013-08-16 15:53:36 -0700
committerPaul Westbrook <pwestbro@google.com>2013-08-16 15:53:36 -0700
commit908fac0b247deff27fee44297f892afdfbb086a5 (patch)
tree75582b3daa04a969af5655e78841f35f72008a38 /src
parentdae31e6c28c2380a680f6fdbff416e4fa31488b2 (diff)
downloadandroid_packages_apps_Email-908fac0b247deff27fee44297f892afdfbb086a5.tar.gz
android_packages_apps_Email-908fac0b247deff27fee44297f892afdfbb086a5.tar.bz2
android_packages_apps_Email-908fac0b247deff27fee44297f892afdfbb086a5.zip
Fix NPE
Bug: 10292690 Change-Id: I34714a6a07bcaba3d20fdae32ee6b129c74c8a32
Diffstat (limited to 'src')
-rw-r--r--src/com/android/email/provider/AttachmentProvider.java13
1 files 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;