commit 702fcbb6646bc2606b2077c8993f1c480b2a3016
author Yorke Lee <yorkelee@google.com> Tue Nov 20 11:08:43 2012 -0800
committer Android Git Automerger <android-git-automerger@android.com> Tue Nov 20 11:08:43 2012 -0800
tree 1d419b9ffe574f13810ba148500c0d014e84e396
parent 2226bfa89a06b72cbd0e825fe85a40bfd2202b10
parent ee3aa9e32802ff8cac0e619912e64474e2ce2f27

am ee3aa9e3: am c75ff8e4: Allow vanity numbers via paste/DIAL intent

* commit 'ee3aa9e32802ff8cac0e619912e64474e2ce2f27':
  Allow vanity numbers via paste/DIAL intent

src/com/android/contacts/util/ContactPhotoUtils.java

diff --git a/src/com/android/contacts/util/ContactPhotoUtils.java b/src/com/android/contacts/util/ContactPhotoUtils.java
index 49be19d..b14b36c 100644
--- a/src/com/android/contacts/util/ContactPhotoUtils.java
+++ b/src/com/android/contacts/util/ContactPhotoUtils.java
@@ -30,6 +30,7 @@
 import java.io.IOException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
+import java.util.Locale;
 
 /**
  * Utilities related to loading/saving contact photos.
@@ -69,7 +70,7 @@
 
     public static String generateTempPhotoFileName() {
         Date date = new Date(System.currentTimeMillis());
-        SimpleDateFormat dateFormat = new SimpleDateFormat(PHOTO_DATE_FORMAT);
+        SimpleDateFormat dateFormat = new SimpleDateFormat(PHOTO_DATE_FORMAT, Locale.US);
         return "ContactPhoto-" + dateFormat.format(date) + ".jpg";
     }