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

Unverified Commit 9fc461f9 authored by Kevin F. Haggerty's avatar Kevin F. Haggerty
Browse files

Merge tag 'android-security-8.1.0_r88' into staging/lineage-15.1_merge_android-security-8.1.0_r88 

Android Security 8.1.0 Release 88 (7249334)

* tag 'android-security-8.1.0_r88':
  Prevent using invalid result uri during multi user image change

Change-Id: I345ab6242f4e1a834b748c6178c33d9b4bf83553
parents 12ee853d 53a7b38f

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

+9 −0
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ import android.os.UserHandle; 
import android.os.UserManager;

import android.provider.ContactsContract.DisplayPhoto;

import android.provider.MediaStore;

import android.util.EventLog;

import android.support.v4.content.FileProvider;

import android.util.Log;

import android.view.Gravity;
@@ -114,6 +115,14 @@ public class EditUserPhotoController { 
        }

        final Uri pictureUri = data != null && data.getData() != null

                ? data.getData() : mTakePictureUri;



        // Check if the result is a content uri

        if (!ContentResolver.SCHEME_CONTENT.equals(pictureUri.getScheme())) {

            Log.e(TAG, "Invalid pictureUri scheme: " + pictureUri.getScheme());

            EventLog.writeEvent(0x534e4554, "172939189", -1, pictureUri.getPath());

            return false;

        }



        switch (requestCode) {

            case REQUEST_CODE_CROP_PHOTO:

                onPhotoCropped(pictureUri, true);