summaryrefslogtreecommitdiffstats
path: root/core/java/android/database
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2011-05-03 14:25:06 -0700
committerElliott Hughes <enh@google.com>2012-01-09 13:36:36 -0800
commit64140a0770f98b56993a96289ec3143e89194265 (patch)
tree6f3d6339a715d965dfda28afbd8a1feab1ce2565 /core/java/android/database
parent7944704e6c4cc10105838b78d3d8403bf66a066b (diff)
downloadframeworks_base-64140a0770f98b56993a96289ec3143e89194265.zip
frameworks_base-64140a0770f98b56993a96289ec3143e89194265.tar.gz
frameworks_base-64140a0770f98b56993a96289ec3143e89194265.tar.bz2
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
Diffstat (limited to 'core/java/android/database')
-rw-r--r--core/java/android/database/DatabaseUtils.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/core/java/android/database/DatabaseUtils.java b/core/java/android/database/DatabaseUtils.java
index a10ca15..01bcdf7 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") ||