summaryrefslogtreecommitdiffstats
path: root/src/com/android/providers
diff options
context:
space:
mode:
authorCristoforo Cataldo <cristoforo.cataldo@gmail.com>2015-01-07 23:44:47 +0100
committerSteve Kondik <steve@cyngn.com>2015-10-31 14:35:57 -0700
commit0d9f1ba7ce1affb8ef2035944a0c0ea1c57704fe (patch)
treefac1e77a5d980f39154d077172e00d433274c2c2 /src/com/android/providers
parenta9564f4cb7ff0699c9fa9791fac54fedb03100ac (diff)
downloadandroid_packages_providers_MediaProvider-0d9f1ba7ce1affb8ef2035944a0c0ea1c57704fe.tar.gz
android_packages_providers_MediaProvider-0d9f1ba7ce1affb8ef2035944a0c0ea1c57704fe.tar.bz2
android_packages_providers_MediaProvider-0d9f1ba7ce1affb8ef2035944a0c0ea1c57704fe.zip
MediaProvider: Avoid null pointer exceptions inside getCompressedAlbumArt
Check if path is not null to avoid a java.lang.NullPointerException. If path is null, the following exception stack trace will be thrown: java.lang.NullPointerException: Attempt to invoke virtual method 'char[] java.lang.String.toCharArray()' on a null object reference at java.io.File.fixSlashes(File.java:185) at java.io.File.<init>(File.java:134) at com.android.providers.media.MediaProvider.getCompressedAlbumArt(MediaProvider.java:4846) at com.android.providers.media.MediaProvider.makeThumbInternal(MediaProvider.java:5015) at com.android.providers.media.MediaProvider.getThumb(MediaProvider.java:5011) at com.android.providers.media.MediaProvider.openFile(MediaProvider.java:4601) at android.content.ContentProvider.openAssetFile(ContentProvider.java:1334) at android.content.ContentProvider.openTypedAssetFile(ContentProvider.java:1514) at android.content.ContentProvider.openTypedAssetFile(ContentProvider.java:1580) at android.content.ContentProvider$Transport.openTypedAssetFile(ContentProvider.java:391) at android.content.ContentProviderNative.onTransact(ContentProviderNative.java:312) at android.os.Binder.execTransact(Binder.java:446) Change-Id: Ie27605590db20e0e4e12095d32864a246cc25573
Diffstat (limited to 'src/com/android/providers')
-rwxr-xr-xsrc/com/android/providers/media/MediaProvider.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/com/android/providers/media/MediaProvider.java b/src/com/android/providers/media/MediaProvider.java
index 180fbef0..28960d53 100755
--- a/src/com/android/providers/media/MediaProvider.java
+++ b/src/com/android/providers/media/MediaProvider.java
@@ -4858,6 +4858,9 @@ public class MediaProvider extends ContentProvider {
// Extract compressed image data from the audio file itself or, if that fails,
// look for a file "AlbumArt.jpg" in the containing directory.
private static byte[] getCompressedAlbumArt(Context context, String[] rootPaths, String path) {
+ if (path == null)
+ return null;
+
byte[] compressed = null;
try {