Merge "DO NOT MERGE synchronize photo storage creation for race conditions." into lmp-dev

1 files 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;