am 7d8ea25e: am 9ca2bf95: am 928cb3f9: am aa396d3e: resolved conflicts for merge of 8df53636 to jb-mr1-dev
* commit '7d8ea25e479744e0b9e9d58a4daa3579631ca3d3':
Set explicit destination for CALL_PRIVILEGED
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";
}