From 697c046e3f0632f698d269423b62bb53a7d37a32 Mon Sep 17 00:00:00 2001
From: Mark Wei <markwei@google.com>
Date: Mon, 17 Sep 2012 11:16:42 -0700
Subject: Prevent NPE in Gmail while viewing photo from attachment

Bug: 7174197
Change-Id: I29ca226b5134888dbe3488f859d9790fe1388984
---
 .../src/com/android/ex/photo/fragments/PhotoViewFragment.java        | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/photoviewer/src/com/android/ex/photo/fragments/PhotoViewFragment.java b/photoviewer/src/com/android/ex/photo/fragments/PhotoViewFragment.java
index 97ea3b8..4e6296b 100644
--- a/photoviewer/src/com/android/ex/photo/fragments/PhotoViewFragment.java
+++ b/photoviewer/src/com/android/ex/photo/fragments/PhotoViewFragment.java
@@ -166,7 +166,10 @@ public class PhotoViewFragment extends Fragment implements
         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);
-- 
cgit v1.2.3