commit 0256e997434b81d11f5b51b97c49bac75acd6d63
author Gary Mai <garymai@google.com> Fri Dec 16 19:00:13 2016 +0000
committer android-build-merger <android-build-merger@google.com> Fri Dec 16 19:00:13 2016 +0000
tree ebb64ac37bf7c8b84519af3ec4deeca5c6ee0ea8
parent cdb539b3abfcc1447be337ef3741e7501510cf14
parent 84b1654c1dd798e018b988cf1d6be28e0b21f4bd

Fix crash from using third party gallery apps
am: 84b1654c1d

Change-Id: Id9cbb149aa86332ab60a4f8d06a51d62be169b19

src/com/android/contacts/detail/PhotoSelectionHandler.java

diff --git a/src/com/android/contacts/detail/PhotoSelectionHandler.java b/src/com/android/contacts/detail/PhotoSelectionHandler.java
index 56d3d66..3053714 100644
--- a/src/com/android/contacts/detail/PhotoSelectionHandler.java
+++ b/src/com/android/contacts/detail/PhotoSelectionHandler.java
@@ -127,17 +127,16 @@
             switch (requestCode) {
                 // Cropped photo was returned
                 case REQUEST_CROP_PHOTO: {
-                    final Uri uri;
                     if (data != null && data.getData() != null) {
-                        uri = data.getData();
-                    } else {
-                        uri = mCroppedPhotoUri;
+                        final Uri croppedUri = data.getData();
+                        ContactPhotoUtils.savePhotoFromUriToUri(mContext, croppedUri,
+                                mCroppedPhotoUri, /* deleteAfterSave */ false);
                     }
 
                     try {
                         // delete the original temporary photo if it exists
                         mContext.getContentResolver().delete(mTempPhotoUri, null, null);
-                        listener.onPhotoSelected(uri);
+                        listener.onPhotoSelected(mCroppedPhotoUri);
                         return true;
                     } catch (FileNotFoundException e) {
                         return false;