Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix NPE" into lmp-mr1-dev

Browse Source
This commit is contained in:
Marco Nelissen
2015-02-17 23:54:29 +00:00
committed by Android (Google) Code Review
parent a94e42970d 0e24cb7fb5
commit ffaee8bda9
1 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/java/android/provider/MediaStore.java
View File

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