commit 3e693f9fe585dff94680e9f20db6fb519dd40414
author Yorke Lee <yorkelee@google.com> Mon Sep 30 17:11:00 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Mon Sep 30 17:11:00 2013 -0700
tree 781a38e0ef70ebf0d081cb356d5735071d221a67
parent 7f69aabb7001b70bca7b0392ca5d98a4aab3dee8
parent b20f092859ec1626accca8c1f8552378c845a886

am b20f0928: Merge "Fix NPE in AttachPhotoActivity after rotating while cropping" into klp-dev

* commit 'b20f092859ec1626accca8c1f8552378c845a886':
  Fix NPE in AttachPhotoActivity after rotating while cropping

src/com/android/contacts/activities/AttachPhotoActivity.java

diff --git a/src/com/android/contacts/activities/AttachPhotoActivity.java b/src/com/android/contacts/activities/AttachPhotoActivity.java
index 678c1d2..78b482e 100644
--- a/src/com/android/contacts/activities/AttachPhotoActivity.java
+++ b/src/com/android/contacts/activities/AttachPhotoActivity.java
@@ -111,6 +111,9 @@
         if (mTempPhotoUri != null) {
             outState.putString(KEY_TEMP_PHOTO_URI, mTempPhotoUri.toString());
         }
+        if (mCroppedPhotoUri != null) {
+            outState.putString(KEY_CROPPED_PHOTO_URI, mCroppedPhotoUri.toString());
+        }
     }
 
     @Override