diff options
| author | kaiyiz <kaiyiz@codeaurora.org> | 2015-01-23 11:00:06 +0800 |
|---|---|---|
| committer | Likai Ding <likaid@codeaurora.org> | 2015-01-23 14:46:44 +0800 |
| commit | 587590fe1002c0ec01ffe5cac29726f48e4b4f6f (patch) | |
| tree | 74dd8b7a5690da3dbc05f88ba68f9a2df51efc6d /src/com/android/camera/CameraActivity.java | |
| parent | be86a06bfd8ccc0b3a6f597903ba1181a9b8f875 (diff) | |
| download | android_packages_apps_Snap-587590fe1002c0ec01ffe5cac29726f48e4b4f6f.tar.gz android_packages_apps_Snap-587590fe1002c0ec01ffe5cac29726f48e4b4f6f.tar.bz2 android_packages_apps_Snap-587590fe1002c0ec01ffe5cac29726f48e4b4f6f.zip | |
SnapdragonCamera: Fix NPE in SnapdragonCamera during monkey test
The mineType will be null if get it from an invalid uri, this may
happen when delete a video very quickly after taken it and back to
Camera, the video data has already gone before notifyNewMeida called.
Add null pointer check before use mimeType to avoid the NPE.
Change-Id: I6021faf2d4016e258153f0a75419f01fdfd7ed6c
CRs-Fixed: 784389
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 e9786431b..ef100fa29 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); |