Merge "Fix NPE" into lmp-mr1-dev (ffaee8bd) · Commits · e / os / android_frameworks_base

core/java/android/provider/MediaStore.java

+11 −12

Original line number	Diff line number	Diff line
		@@ -638,7 +638,6 @@ public final class MediaStore {
		static Bitmap getThumbnail(ContentResolver cr, long origId, long groupId, int kind,
		BitmapFactory.Options options, Uri baseUri, boolean isVideo) {
		Bitmap bitmap = null;
		String filePath = null;
		// Log.v(TAG, "getThumbnail: origId="+origId+", kind="+kind+", isVideo="+isVideo);
		// If the magic is non-zero, we simply return thumbnail if it does exist.
		// querying MediaProvider and simply return thumbnail.
		@@ -710,20 +709,20 @@ public final class MediaStore {
		Uri uri = Uri.parse(
		baseUri.buildUpon().appendPath(String.valueOf(origId))
		.toString().replaceFirst("thumbnails", "media"));
		if (filePath == null) {
		if (c != null) c.close();
		c = cr.query(uri, PROJECTION, null, null, null);
		if (c == null \|\| !c.moveToFirst()) {
		return null;
		}
		filePath = c.getString(1);
		}
		String filePath = c.getString(1);
		if (filePath != null) {
		if (isVideo) {
		bitmap = ThumbnailUtils.createVideoThumbnail(filePath, kind);
		} else {
		bitmap = ThumbnailUtils.createImageThumbnail(filePath, kind);
		}
		}
		}
		} catch (SQLiteException ex) {
		Log.w(TAG, ex);
		} finally {