summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorMarco Nelissen <marcone@google.com>2012-05-17 09:53:02 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-05-17 09:53:02 -0700
commitd88404d0a1991a13cce9d5e55e4314828839311d (patch)
tree6993318a4a43ef0d7991435cd4c7704d52200d4b /media
parent76c0c612cdd5eeef8ff2f7a4478f6320a713d7a3 (diff)
parent538d4925b36067dc89ad0625a69dafeaa364bd2e (diff)
downloadframeworks_base-d88404d0a1991a13cce9d5e55e4314828839311d.zip
frameworks_base-d88404d0a1991a13cce9d5e55e4314828839311d.tar.gz
frameworks_base-d88404d0a1991a13cce9d5e55e4314828839311d.tar.bz2
Merge "Fix .pls playlist parsing" into jb-dev
Diffstat (limited to 'media')
-rw-r--r--media/java/android/media/MediaScanner.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/media/java/android/media/MediaScanner.java b/media/java/android/media/MediaScanner.java
index 821a251b..987c0ac 100644
--- a/media/java/android/media/MediaScanner.java
+++ b/media/java/android/media/MediaScanner.java
@@ -1623,7 +1623,7 @@ public class MediaScanner
if (line.startsWith("File")) {
int equals = line.indexOf('=');
if (equals > 0) {
- cachePlaylistEntry(line, playListDirectory);
+ cachePlaylistEntry(line.substring(equals + 1), playListDirectory);
}
}
line = reader.readLine();