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

Commit e68c1f3d authored by Andras Kloczl's avatar Andras Kloczl
Browse files

Prevent using invalid result uri during multi user image change 

Test: manual
Bug: 172939189
Change-Id: Id2e598878b3250e8b3590905c6def561e2437d55
parent 4803f158

packages/SettingsLib/src/com/android/settingslib/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.util.Log;

import android.view.Gravity;

import android.view.View;
@@ -126,6 +127,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);