diff options
| author | Mark Wei <markwei@google.com> | 2012-09-19 00:51:23 -0700 |
|---|---|---|
| committer | Mark Wei <markwei@google.com> | 2012-09-19 01:27:38 -0700 |
| commit | c907eecdbdf8a2b85280f27f636c332f3a0fa699 (patch) | |
| tree | cb57f93a0a21c04e32acd047783c209d9636564c /photoviewer | |
| parent | bd64181d797dabd8b346b97ebb3e4083e53b864d (diff) | |
| download | android_frameworks_ex-c907eecdbdf8a2b85280f27f636c332f3a0fa699.tar.gz android_frameworks_ex-c907eecdbdf8a2b85280f27f636c332f3a0fa699.tar.bz2 android_frameworks_ex-c907eecdbdf8a2b85280f27f636c332f3a0fa699.zip | |
Prevent NPE while viewing photo from attachment.
Bug: 7189283
Change-Id: Ibcb98ae13cf801a6934e0ed4efb4c5349678dcce
Diffstat (limited to 'photoviewer')
| -rw-r--r-- | photoviewer/src/com/android/ex/photo/fragments/PhotoViewFragment.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/photoviewer/src/com/android/ex/photo/fragments/PhotoViewFragment.java b/photoviewer/src/com/android/ex/photo/fragments/PhotoViewFragment.java index 4e6296b..429c403 100644 --- a/photoviewer/src/com/android/ex/photo/fragments/PhotoViewFragment.java +++ b/photoviewer/src/com/android/ex/photo/fragments/PhotoViewFragment.java @@ -172,8 +172,10 @@ public class PhotoViewFragment extends Fragment implements } } - mResolvedPhotoUri = mIntent.getStringExtra(Intents.EXTRA_RESOLVED_PHOTO_URI); - mThumbnailUri = mIntent.getStringExtra(Intents.EXTRA_THUMBNAIL_URI); + if (mIntent != null) { + mResolvedPhotoUri = mIntent.getStringExtra(Intents.EXTRA_RESOLVED_PHOTO_URI); + mThumbnailUri = mIntent.getStringExtra(Intents.EXTRA_THUMBNAIL_URI); + } } @Override |