am 2a9d1fa: Merge "Make CONTACTS_AS_MULTI_VCARD locale safe"

* commit '2a9d1fab1669d2962aa830872f063c1180fbea94': Make CONTACTS_AS_MULTI_VCARD locale safe
aosp-mirror · Oct 2, 2012 · 0e01472 · 0e01472
2 parents 3b1b1d5 + 2a9d1fa
commit 0e01472
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/com/android/providers/contacts/ContactsProvider2.java b/src/com/android/providers/contacts/ContactsProvider2.java
@@ -5025,7 +5025,7 @@ protected Cursor queryLocal(final Uri uri, final String[] projection, String sel
             }
 
             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" +