Merge "Fix .pls playlist parsing" into jb-dev

marcone · Android (Google) Code Review · commit d88404d0a199 · 2012-05-17T09:53:02.000-07:00
diff --git a/media/java/android/media/MediaScanner.java b/media/java/android/media/MediaScanner.java
@@ -1623,7 +1623,7 @@ private void processPlsPlayList(String path, String playListDirectory, Uri uri,
                     if (line.startsWith("File")) {
                         int equals = line.indexOf('=');
                         if (equals > 0) {
-                            cachePlaylistEntry(line, playListDirectory);
+                            cachePlaylistEntry(line.substring(equals + 1), playListDirectory);
                         }
                     }
                     line = reader.readLine();

Original file line number	Diff line number	Diff line change
`@@ -1623,7 +1623,7 @@ private void processPlsPlayList(String path, String playListDirectory, Uri uri,`
`1623`	`1623`	`if (line.startsWith("File")) {`
`1624`	`1624`	`int equals = line.indexOf('=');`
`1625`	`1625`	`if (equals > 0) {`
`1626`		`- cachePlaylistEntry(line, playListDirectory);`
	`1626`	`+ cachePlaylistEntry(line.substring(equals + 1), playListDirectory);`
`1627`	`1627`	`}`
`1628`	`1628`	`}`
`1629`	`1629`	`line = reader.readLine();`