summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera/ThumbnailController.java
diff options
context:
space:
mode:
authorWu-cheng Li <wuchengli@google.com>2009-06-18 16:37:32 +0800
committerWu-cheng Li <wuchengli@google.com>2009-06-18 16:37:32 +0800
commit8d16a5c7fc75e70782efbe970a756de92b564b35 (patch)
tree33d2fbbeaa3dc4c9f611ace427945f9fd56169f3 /src/com/android/camera/ThumbnailController.java
parent55319ceeef829274a95e2a41e7e365228acf5ccd (diff)
downloadLegacyCamera-8d16a5c7fc75e70782efbe970a756de92b564b35.zip
LegacyCamera-8d16a5c7fc75e70782efbe970a756de92b564b35.tar.gz
LegacyCamera-8d16a5c7fc75e70782efbe970a756de92b564b35.tar.bz2
Handle openFileDescriptor failure case.
Fix b1925294
Diffstat (limited to 'src/com/android/camera/ThumbnailController.java')
-rw-r--r--src/com/android/camera/ThumbnailController.java10
1 files changed, 9 insertions, 1 deletions
diff --git a/src/com/android/camera/ThumbnailController.java b/src/com/android/camera/ThumbnailController.java
index 0fcc66c..39a1d7d 100644
--- a/src/com/android/camera/ThumbnailController.java
+++ b/src/com/android/camera/ThumbnailController.java
@@ -24,6 +24,8 @@ import android.graphics.drawable.BitmapDrawable;
import android.graphics.drawable.Drawable;
import android.graphics.drawable.TransitionDrawable;
import android.net.Uri;
+import android.os.ParcelFileDescriptor;
+import android.util.Log;
import android.view.View;
import android.view.ViewGroup.LayoutParams;
import android.view.animation.AlphaAnimation;
@@ -207,7 +209,13 @@ public class ThumbnailController {
return false;
}
try {
- mContentResolver.openFileDescriptor(mUri, "r").close();
+ ParcelFileDescriptor pfd =
+ mContentResolver.openFileDescriptor(mUri, "r");
+ if (pfd == null) {
+ Log.e(TAG, "Fail to open URI.");
+ return false;
+ }
+ pfd.close();
} catch (IOException ex) {
return false;
}