commit 4214d57a4a87dbebc7c937275acc9b54fd718697
author Chiao Cheng <chiaocheng@google.com> Wed Jul 10 11:04:16 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Wed Jul 10 11:04:16 2013 -0700
tree 546f64a5eb44d0aad53145c9fe788e238bb23215
parent 2c684acab5810cf55780457bda7e5c8895ed1037
parent 9c842fcf486ed5c70ca6db3106349aade27751bf

am 9c842fcf: White list file names and do not allow ".."

* commit '9c842fcf486ed5c70ca6db3106349aade27751bf':
  White list file names and do not allow ".."

src/com/android/providers/contacts/ContactsProvider2.java

diff --git a/src/com/android/providers/contacts/ContactsProvider2.java b/src/com/android/providers/contacts/ContactsProvider2.java
index 43afcb6..c9c7f2f 100644
--- a/src/com/android/providers/contacts/ContactsProvider2.java
+++ b/src/com/android/providers/contacts/ContactsProvider2.java
@@ -5080,7 +5080,7 @@
             }
 
             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" +