diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2015-02-09 12:37:27 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2015-02-09 12:37:27 -0800 |
| commit | c9bee6423252ba1eedc6b6d9a5a86b953aac7de6 (patch) | |
| tree | c3232e4027d7a658d3ff0cd7f807cbbb25df2fe9 /src/com/android/camera/CameraActivity.java | |
| parent | 3479484dc62c294803ff0284713803ee83954083 (diff) | |
| parent | 587590fe1002c0ec01ffe5cac29726f48e4b4f6f (diff) | |
| download | android_packages_apps_Snap-c9bee6423252ba1eedc6b6d9a5a86b953aac7de6.tar.gz android_packages_apps_Snap-c9bee6423252ba1eedc6b6d9a5a86b953aac7de6.tar.bz2 android_packages_apps_Snap-c9bee6423252ba1eedc6b6d9a5a86b953aac7de6.zip | |
Merge "SnapdragonCamera: Fix NPE in SnapdragonCamera during monkey test"
Diffstat (limited to 'src/com/android/camera/CameraActivity.java')
| -rw-r--r-- | src/com/android/camera/CameraActivity.java | 4 |
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); |