commit e38232b7cdbfae492dcdbbb8084de7b70e6dc00c
author Mark Wei <markwei@google.com> Thu Sep 20 06:08:02 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Thu Sep 20 06:08:02 2012 -0700
tree e1518c68deaa1f24c30006c6816fbbab57536800
parent d423d51a8b69af0dcc3ef349bd81f13a7b249a76
parent d00f71f141a7962045271cccebad9438e3b452e7

am da78c1dc: am c907eecd: Prevent NPE while viewing photo from attachment.

* commit 'da78c1dc07cd36e04c98f1d468b45766f1e0e0c6':
  Prevent NPE while viewing photo from attachment.

src/com/android/ex/photo/fragments/PhotoViewFragment.java

diff --git a/src/com/android/ex/photo/fragments/PhotoViewFragment.java b/src/com/android/ex/photo/fragments/PhotoViewFragment.java
index 4e6296b..429c403 100644
--- a/src/com/android/ex/photo/fragments/PhotoViewFragment.java
+++ b/src/com/android/ex/photo/fragments/PhotoViewFragment.java
@@ -172,8 +172,10 @@
             }
         }
 
-        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