diff options
| author | Marco Nelissen <marcone@google.com> | 2009-09-27 19:50:49 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-09-27 19:50:49 -0700 |
| commit | aa507136493b24a899b270367b08a7158085c9b8 (patch) | |
| tree | 814c16b000c41697daa57f7cdd54d1a6cccb0c42 /media/java | |
| parent | 216638a0357e8f3abf452c4bd073d8ee2cdb4bb0 (diff) | |
| parent | dba93b68326f139f669aefa6770d50daff032746 (diff) | |
| download | frameworks_base-aa507136493b24a899b270367b08a7158085c9b8.zip frameworks_base-aa507136493b24a899b270367b08a7158085c9b8.tar.gz frameworks_base-aa507136493b24a899b270367b08a7158085c9b8.tar.bz2 | |
am dba93b68: Merge change 27318 into eclair
Merge commit 'dba93b68326f139f669aefa6770d50daff032746' into eclair-plus-aosp
* commit 'dba93b68326f139f669aefa6770d50daff032746':
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; } |