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

Commit f7b1ae4e authored by Jason Monk's avatar Jason Monk
Browse files

Workaround to avoid crash in user photo selection 

Bug: 29556966
Change-Id: I0715dee2a4cef2252b4ed1cc4d242b8b3d0ab45c
parent 87fcf9e9

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

+7 −1
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ import android.graphics.Rect; 
import android.graphics.drawable.Drawable;

import android.net.Uri;

import android.os.AsyncTask;

import android.os.StrictMode;

import android.os.UserHandle;

import android.os.UserManager;

import android.provider.ContactsContract.DisplayPhoto;
@@ -223,7 +224,12 @@ public class EditUserPhotoController { 
        appendOutputExtra(intent, mCropPictureUri);

        appendCropExtras(intent);

        if (intent.resolveActivity(mContext.getPackageManager()) != null) {

            try {

                StrictMode.disableDeathOnFileUriExposure();

                mFragment.startActivityForResult(intent, REQUEST_CODE_CROP_PHOTO);

            } finally {

                StrictMode.enableDeathOnFileUriExposure();

            }

        } else {

            onPhotoCropped(pictureUri, false);

        }