commit 524ac65920b684ca4602e23981cb976e2bab0f0d
author Mark Wei <markwei@google.com> Mon Sep 17 14:53:52 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Mon Sep 17 14:53:52 2012 -0700
tree 8068b6bf251b700d78ee4ec44cd37e29b9988c31
parent 1389ae2ea3376b317e4810f9e3b123a0cb5ac008
parent 8cf57a5aa662abd4776ffd4a4261d45bfa05f5ea

am 34672da4: am 4030071b: am 697c046e: Prevent NPE in Gmail while viewing photo from attachment

* commit '34672da452ddf07347d2e9fc02f6d66c954ebba3':
  Prevent NPE in Gmail 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 c6c2e3b..779ff3b 100644
--- a/src/com/android/ex/photo/fragments/PhotoViewFragment.java
+++ b/src/com/android/ex/photo/fragments/PhotoViewFragment.java
@@ -166,7 +166,10 @@
         super.onCreate(savedInstanceState);
 
         if (savedInstanceState != null) {
-            mIntent = new Intent().putExtras(savedInstanceState.getBundle(STATE_INTENT_KEY));
+            final Bundle state = savedInstanceState.getBundle(STATE_INTENT_KEY);
+            if (state != null) {
+                mIntent = new Intent().putExtras(state);
+            }
         }
 
         mResolvedPhotoUri = mIntent.getStringExtra(Intents.EXTRA_RESOLVED_PHOTO_URI);