aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMakoto Onuki <omakoto@google.com>2012-10-02 12:05:09 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-10-02 12:05:09 -0700
commit0e014723e6d5d2acc3d59b78cee9a6d1fbfef1e9 (patch)
tree36cfadf76c522663a404293b9a90acc23bf027cc
parent3b1b1d5e732728ea7d60b408ab03f42e5d9ace8f (diff)
parent2a9d1fab1669d2962aa830872f063c1180fbea94 (diff)
downloadContactsProvider-tools_r21.tar.gz
am 2a9d1fab: Merge "Make CONTACTS_AS_MULTI_VCARD locale safe"tools_r21
* commit '2a9d1fab1669d2962aa830872f063c1180fbea94': Make CONTACTS_AS_MULTI_VCARD locale safe
-rw-r--r--src/com/android/providers/contacts/ContactsProvider2.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/providers/contacts/ContactsProvider2.java b/src/com/android/providers/contacts/ContactsProvider2.java
index 26aac63a..fec59446 100644
--- a/src/com/android/providers/contacts/ContactsProvider2.java
+++ b/src/com/android/providers/contacts/ContactsProvider2.java
@@ -5025,7 +5025,7 @@ public class ContactsProvider2 extends AbstractContactsProvider
}
case CONTACTS_AS_MULTI_VCARD: {
- SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMdd_HHmmss");
+ SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMdd_HHmmss", Locale.US);
String currentDateString = dateFormat.format(new Date()).toString();
return mActiveDb.get().rawQuery(
"SELECT" +