PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge \\"Workaround to avoid crash in user photo selection\\" into nyc-dev am: 8f75abf92f

Browse Source 
am: 4c33973714

Change-Id: Ieaa97e10d4e0173b74bb0015aa5c646857b92145
This commit is contained in:
Jason Monk
2016-06-22 19:52:32 +00:00
committed by android-build-merger
parent f422b7bba9 4c33973714
commit d12b359e09
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/com/android/settings/users/EditUserPhotoController.java
View File

@@ -32,6 +32,7 @@ import android.graphics.Rect;
import android.graphics.drawable.Drawable; import android.graphics.drawable.Drawable;
import android.net.Uri; import android.net.Uri;
import android.os.AsyncTask; import android.os.AsyncTask;
import android.os.StrictMode;
import android.os.UserHandle; import android.os.UserHandle;
import android.os.UserManager; import android.os.UserManager;
import android.provider.ContactsContract.DisplayPhoto; import android.provider.ContactsContract.DisplayPhoto;
@@ -223,7 +224,12 @@ public class EditUserPhotoController {
appendOutputExtra(intent, mCropPictureUri); appendOutputExtra(intent, mCropPictureUri);
appendCropExtras(intent); appendCropExtras(intent);
if (intent.resolveActivity(mContext.getPackageManager()) != null) { if (intent.resolveActivity(mContext.getPackageManager()) != null) {
mFragment.startActivityForResult(intent, REQUEST_CODE_CROP_PHOTO); try {
StrictMode.disableDeathOnFileUriExposure();
mFragment.startActivityForResult(intent, REQUEST_CODE_CROP_PHOTO);
} finally {
StrictMode.enableDeathOnFileUriExposure();
}
} else { } else {
onPhotoCropped(pictureUri, false); onPhotoCropped(pictureUri, false);
} }