commit dba93b68326f139f669aefa6770d50daff032746
author Android (Google) Code Review <android-gerrit@google.com> Sun Sep 27 22:43:05 2009 -0400
committer Android (Google) Code Review <android-gerrit@google.com> Sun Sep 27 22:43:05 2009 -0400
tree d7475c3a84d38c8182aab94db150f6c357c7a4f1
parent e883847f177665102ebc6b2369dbfbfd1e79cf62
parent d4f3586c93cd9c29056e95cd79f3cb19ac456f3b

Merge change 27318 into eclair

* changes:
  Check that playlist entries refer to a row in the audio table.

media/java/android/media/MediaScanner.java

diff --git a/media/java/android/media/MediaScanner.java b/media/java/android/media/MediaScanner.java
index 21ad82b..3a3ae5f 100644
--- a/media/java/android/media/MediaScanner.java
+++ b/media/java/android/media/MediaScanner.java
@@ -1273,7 +1273,8 @@
             }
         }
 
-        if (bestMatch == null) {
+        // if the match is not for an audio file, bail out
+        if (bestMatch == null || ! mAudioUri.equals(bestMatch.mTableUri)) {
             return false;
         }