summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorxiaoch <xiaoch@codeaurora.org>2016-04-07 11:02:09 +0800
committerAdrian DC <radian.dc@gmail.com>2016-12-03 20:18:30 +0100
commit0f9dee86e71e83fa6653126bc30678fd82d62829 (patch)
tree9189506cc4abc49c058b33f8e659315431611084
parent5d553e01df974bd15779d63a4dc1f3e382830a66 (diff)
downloadandroid_packages_providers_MediaProvider-0f9dee86e71e83fa6653126bc30678fd82d62829.tar.gz
android_packages_providers_MediaProvider-0f9dee86e71e83fa6653126bc30678fd82d62829.tar.bz2
android_packages_providers_MediaProvider-0f9dee86e71e83fa6653126bc30678fd82d62829.zip
Music: Fix force closed when plug out the SD card while music is playing.
method getCompressedAlbumArt() return null if file path is null, because it will occur NullPointerException. RM-290 Change-Id: I051636bd844764cc64aa663f2a1e1ecc621b672c CRs-Fixed: 994948
-rwxr-xr-xsrc/com/android/providers/media/MediaProvider.java4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/com/android/providers/media/MediaProvider.java b/src/com/android/providers/media/MediaProvider.java
index 1b929ebc..fb5551fc 100755
--- a/src/com/android/providers/media/MediaProvider.java
+++ b/src/com/android/providers/media/MediaProvider.java
@@ -4911,6 +4911,10 @@ public class MediaProvider extends ContentProvider {
byte[] compressed = null;
+ //When playing Music,plug out the SD card to cause this case.
+ if (path == null) {
+ return null;
+ }
try {
File f = new File(path);
ParcelFileDescriptor pfd = ParcelFileDescriptor.open(f,