summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorAndroid (Google) Code Review <android-gerrit@google.com>2009-05-22 15:35:26 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2009-05-22 15:35:26 -0700
commit53cf55c64f85c11c4da4c47edddb387a396bb8b6 (patch)
tree95d1eead5047bba8647b91195b04d43d75647f29 /core
parent73c551d2582c2704cf60c7530fbc77eab846f4ed (diff)
parente754e128e6237ea1c5b263ec2a02b0413851cfba (diff)
downloadframeworks_base-53cf55c64f85c11c4da4c47edddb387a396bb8b6.zip
frameworks_base-53cf55c64f85c11c4da4c47edddb387a396bb8b6.tar.gz
frameworks_base-53cf55c64f85c11c4da4c47edddb387a396bb8b6.tar.bz2
Merge change 2349 into donut
* changes: Change the media key algorithm to also ignore double quotes.
Diffstat (limited to 'core')
-rw-r--r--core/java/android/provider/MediaStore.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/provider/MediaStore.java b/core/java/android/provider/MediaStore.java
index b6f96c4..51d1951 100644
--- a/core/java/android/provider/MediaStore.java
+++ b/core/java/android/provider/MediaStore.java
@@ -737,7 +737,7 @@ public final class MediaStore
name.endsWith(", a") || name.endsWith(",a")) {
name = name.substring(0, name.lastIndexOf(','));
}
- name = name.replaceAll("[\\[\\]\\(\\)'.,?!]", "").trim();
+ name = name.replaceAll("[\\[\\]\\(\\)\"'.,?!]", "").trim();
if (name.length() > 0) {
// Insert a separator between the characters to avoid
// matches on a partial character. If we ever change