diff options
| author | Marco Nelissen <marcone@google.com> | 2009-09-27 15:00:26 -0700 |
|---|---|---|
| committer | Marco Nelissen <marcone@google.com> | 2009-09-27 15:06:03 -0700 |
| commit | d4f3586c93cd9c29056e95cd79f3cb19ac456f3b (patch) | |
| tree | 28c03fbafad8207cc852c63cffdf363efee5998f /media/java | |
| parent | 0ddbc35dc4974fbe18a4191e579b1eda5a7ef2b1 (diff) | |
| download | frameworks_base-d4f3586c93cd9c29056e95cd79f3cb19ac456f3b.zip frameworks_base-d4f3586c93cd9c29056e95cd79f3cb19ac456f3b.tar.gz frameworks_base-d4f3586c93cd9c29056e95cd79f3cb19ac456f3b.tar.bz2 | |
Check that playlist entries refer to a row in the audio table.
Diffstat (limited to 'media/java')
| -rw-r--r-- | media/java/android/media/MediaScanner.java | 3 |
1 files changed, 2 insertions, 1 deletions
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 @@ public class MediaScanner } } - if (bestMatch == null) { + // if the match is not for an audio file, bail out + if (bestMatch == null || ! mAudioUri.equals(bestMatch.mTableUri)) { return false; } |