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

am ffaee8bd: Merge "Fix NPE" into lmp-mr1-dev

Browse Source 
* commit 'ffaee8bda9c8d22af17098fec0e6626301d91844':
  Fix NPE
This commit is contained in:
Marco Nelissen
2015-02-18 00:01:02 +00:00
committed by Android Git Automerger
parent ab8f60e425 ffaee8bda9
commit 2f71ee24c5
1 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
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,
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,18 +709,18 @@ 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);
if (c != null) c.close();
c = cr.query(uri, PROJECTION, null, null, null);
if (c == null || !c.moveToFirst()) {
return null;
}
if (isVideo) {
bitmap = ThumbnailUtils.createVideoThumbnail(filePath, kind);
} else {
bitmap = ThumbnailUtils.createImageThumbnail(filePath, kind);
String filePath = c.getString(1);
if (filePath != null) {
if (isVideo) {
bitmap = ThumbnailUtils.createVideoThumbnail(filePath, kind);
} else {
bitmap = ThumbnailUtils.createImageThumbnail(filePath, kind);
}
}
}
} catch (SQLiteException ex) {