Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8f75abf9 authored by Jason Monk's avatar Jason Monk Committed by Android (Google) Code Review
Browse files

Merge "Workaround to avoid crash in user photo selection" into nyc-dev

parents 4b336099 f7b1ae4e

src/com/android/settings/users/EditUserPhotoController.java

+7 −1
Original line number Original line Diff line number Diff line
@@ -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) {

            try {

                StrictMode.disableDeathOnFileUriExposure();

                mFragment.startActivityForResult(intent, REQUEST_CODE_CROP_PHOTO);

                mFragment.startActivityForResult(intent, REQUEST_CODE_CROP_PHOTO);

            } finally {

                StrictMode.enableDeathOnFileUriExposure();

            }

        } else {

        } else {

            onPhotoCropped(pictureUri, false);

            onPhotoCropped(pictureUri, false);

        }

        }