From 64140a0770f98b56993a96289ec3143e89194265 Mon Sep 17 00:00:00 2001 From: Elliott Hughes Date: Tue, 3 May 2011 14:25:06 -0700 Subject: [PATCH] Fix Music import for Turkish locales. For non-localized strings like the keywords in SQL statements, we shouldn't use locale-specific case transformations. (Cherry pick of 03f8f84c345e7c861a6de889d434b9d82cf04c8d.) Bug: 4284951 Change-Id: If5b7154f70a7db22837d071d1c57e929729b7d35 --- core/java/android/database/DatabaseUtils.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/core/java/android/database/DatabaseUtils.java b/core/java/android/database/DatabaseUtils.java index a10ca1502a777..01bcdf7404f5f 100644 --- a/core/java/android/database/DatabaseUtils.java +++ b/core/java/android/database/DatabaseUtils.java @@ -39,6 +39,7 @@ import java.io.FileNotFoundException; import java.io.PrintStream; import java.text.Collator; import java.util.HashMap; +import java.util.Locale; import java.util.Map; /** @@ -1318,7 +1319,7 @@ public class DatabaseUtils { if (sql.length() < 3) { return STATEMENT_OTHER; } - String prefixSql = sql.substring(0, 3).toUpperCase(); + String prefixSql = sql.substring(0, 3).toUpperCase(Locale.US); if (prefixSql.equals("SEL")) { return STATEMENT_SELECT; } else if (prefixSql.equals("INS") ||