Merge change 6231 into donut
* changes:
Don't trim() in the mediascanner, as that would remove the special "sort first" character.
diff --git a/media/java/android/media/MediaScanner.java b/media/java/android/media/MediaScanner.java
index 3dd8563..cccc0fc 100644
--- a/media/java/android/media/MediaScanner.java
+++ b/media/java/android/media/MediaScanner.java
@@ -544,7 +544,10 @@
public void handleStringTag(String name, String value) {
if (name.equalsIgnoreCase("title") || name.startsWith("title;")) {
- mTitle = value.trim();
+ // Don't trim() here, to preserve the special \001 character
+ // used to force sorting. The media provider will trim() before
+ // inserting the title in to the database.
+ mTitle = value;
} else if (name.equalsIgnoreCase("artist") || name.startsWith("artist;")) {
mArtist = value.trim();
} else if (name.equalsIgnoreCase("albumartist") || name.startsWith("albumartist;")) {