summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMakoto Onuki <omakoto@google.com>2012-10-02 12:10:48 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-10-02 12:10:48 -0700
commit874e0edc8875776588dd42dca29cdb0a10b76eb0 (patch)
tree183ba2477a3a95ad8adbef5a4437a238ece80828
parentbe431bb0e55260ad0ea7a09269669ca45d9db906 (diff)
parent94fc236d199460bddc390ce7f384b446c14df622 (diff)
downloadpackages_providers_ContactsProvider-874e0edc8875776588dd42dca29cdb0a10b76eb0.zip
packages_providers_ContactsProvider-874e0edc8875776588dd42dca29cdb0a10b76eb0.tar.gz
packages_providers_ContactsProvider-874e0edc8875776588dd42dca29cdb0a10b76eb0.tar.bz2
am 94fc236d: am 0e014723: am 2a9d1fab: Merge "Make CONTACTS_AS_MULTI_VCARD locale safe"
* commit '94fc236d199460bddc390ce7f384b446c14df622': 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 9ba3e91..b91e577 100644
--- a/src/com/android/providers/contacts/ContactsProvider2.java
+++ b/src/com/android/providers/contacts/ContactsProvider2.java
@@ -5080,7 +5080,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 db.rawQuery(
"SELECT" +