From 5799f2bcbabe927ed91e3df4f71e54f8cb1f770c Mon Sep 17 00:00:00 2001 From: Zheng Fu Date: Tue, 16 Sep 2014 14:38:01 -0700 Subject: DO NOT MERGE synchronize photo storage creation for race conditions. Several exceptions were reported regarding "Unable to create photo storage directory /data/user/0/com.android.providers.contacts/files/photos". It might caused by the fact that File.makeDirs() is not thread safe. So make it syncrhonized to resolve this issue. Bug:17505392 Bug:17449819 Change-Id: I494204424c024c2166340af609423a669e741761 (cherry picked from commit 240d10d677b4acfeda5aa6e66c2cdea9ae02769b) --- src/com/android/providers/contacts/PhotoStore.java | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/com/android/providers/contacts/PhotoStore.java b/src/com/android/providers/contacts/PhotoStore.java index e7be48c4..79042c40 100644 --- a/src/com/android/providers/contacts/PhotoStore.java +++ b/src/com/android/providers/contacts/PhotoStore.java @@ -39,6 +39,8 @@ import java.util.Set; */ public class PhotoStore { + private static final Object MKDIRS_LOCK = new Object(); + private final String TAG = PhotoStore.class.getSimpleName(); // Directory name under the root directory for photo storage. @@ -66,10 +68,12 @@ public class PhotoStore { */ public PhotoStore(File rootDirectory, ContactsDatabaseHelper databaseHelper) { mStorePath = new File(rootDirectory, DIRECTORY); - if (!mStorePath.exists()) { - if(!mStorePath.mkdirs()) { - throw new RuntimeException("Unable to create photo storage directory " - + mStorePath.getPath()); + synchronized (MKDIRS_LOCK) { + if (!mStorePath.exists()) { + if (!mStorePath.mkdirs()) { + throw new RuntimeException("Unable to create photo storage directory " + + mStorePath.getPath()); + } } } mDatabaseHelper = databaseHelper; -- cgit v1.2.3