diff options
| author | Mark Wei <markwei@google.com> | 2012-09-20 09:29:17 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-09-20 09:29:17 -0700 |
| commit | 01007eb766b9fbc18116b401d5d1c086e6f5515d (patch) | |
| tree | 526d1932f7d23021edcdb68602f404c489f6dc0c /photoviewer | |
| parent | a8141795acc5fce10d992d398b7782be38a4426b (diff) | |
| parent | 057837890de13cc9fd6909f4c4a69abec388a34d (diff) | |
| download | android_frameworks_ex-01007eb766b9fbc18116b401d5d1c086e6f5515d.tar.gz android_frameworks_ex-01007eb766b9fbc18116b401d5d1c086e6f5515d.tar.bz2 android_frameworks_ex-01007eb766b9fbc18116b401d5d1c086e6f5515d.zip | |
am 05783789: am da78c1dc: am c907eecd: Prevent NPE while viewing photo from attachment.
* commit '057837890de13cc9fd6909f4c4a69abec388a34d':
Prevent NPE while viewing photo from attachment.
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 779ff3b..23171dd 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 |