summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera/CameraActivity.java
diff options
context:
space:
mode:
Diffstat (limited to 'src/com/android/camera/CameraActivity.java')
-rw-r--r--src/com/android/camera/CameraActivity.java4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java
index f1734b609..300975845 100644
--- a/src/com/android/camera/CameraActivity.java
+++ b/src/com/android/camera/CameraActivity.java
@@ -996,6 +996,10 @@ public class CameraActivity extends Activity
public void notifyNewMedia(Uri uri) {
ContentResolver cr = getContentResolver();
String mimeType = cr.getType(uri);
+ if (mimeType == null) {
+ Log.e(TAG, "mimeType is NULL");
+ return;
+ }
if (mimeType.startsWith("video/")) {
sendBroadcast(new Intent(CameraUtil.ACTION_NEW_VIDEO, uri));
mDataAdapter.addNewVideo(cr, uri);