Fix for arabic crash

Make sure not to localize when using String.format to build SQL.

Bug 5619742

Change-Id: I66fd9c4a50dd6c083099a9def93840ff05aed5a6

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

@@ -58,6 +58,7 @@
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Locale;
 
 /**
  * ContactAggregator deals with aggregating contact information coming from different sources.
@@ -351,11 +352,11 @@ public ContactAggregator(ContactsProvider2 contactsProvider,
         mMimeTypeIdPhone = mDbHelper.getMimeTypeId(Phone.CONTENT_ITEM_TYPE);
 
         // Query used to retrieve data from raw contacts to populate the corresponding aggregate
-        mRawContactsQueryByRawContactId = String.format(
+        mRawContactsQueryByRawContactId = String.format(Locale.US,
                 RawContactsQuery.SQL_FORMAT_BY_RAW_CONTACT_ID,
                 mMimeTypeIdPhoto, mMimeTypeIdPhone);
 
-        mRawContactsQueryByContactId = String.format(
+        mRawContactsQueryByContactId = String.format(Locale.US,
                 RawContactsQuery.SQL_FORMAT_BY_CONTACT_ID,
                 mMimeTypeIdPhoto, mMimeTypeIdPhone);
     }

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

@@ -6063,7 +6063,8 @@ private Cursor bundleLetterCountExtras(Cursor cursor, final SQLiteDatabase db,
 
         String locale = getLocale().toString();
         HashMap<String, String> projectionMap = Maps.newHashMap();
-        String sectionHeading = String.format(AddressBookIndexQuery.SECTION_HEADING, sortKey);
+        String sectionHeading = String.format(Locale.US, AddressBookIndexQuery.SECTION_HEADING,
+                sortKey);
         projectionMap.put(AddressBookIndexQuery.LETTER,
                 sectionHeading + " AS " + AddressBookIndexQuery.LETTER);