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

Prevent using invalid result uri during multi user image change

Browse Source 
Test: manual
Bug: 172939189
Change-Id: I3e6f6200e82e86d6a2085652906ad2d0d44814f5
Merged-In: Id2e598878b3250e8b3590905c6def561e2437d55
Merged-In: I15e15ad88b768a5b679de32c5429d921d850a3cb
(cherry picked from commit 07e414017c)
This commit is contained in:
Andras Kloczl
2021-03-09 20:38:56 +00:00
committed by android-build-team Robot
parent 92531e87ea
commit d4f04398c7
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -36,6 +36,7 @@ import android.os.UserHandle;
import android.os.UserManager; import android.os.UserManager;
import android.provider.ContactsContract.DisplayPhoto; import android.provider.ContactsContract.DisplayPhoto;
import android.provider.MediaStore; import android.provider.MediaStore;
import android.util.EventLog;
import android.util.Log; import android.util.Log;
import android.view.Gravity; import android.view.Gravity;
import android.view.View; import android.view.View;
@@ -116,6 +117,14 @@ public class EditUserPhotoController {
} }
final Uri pictureUri = data != null && data.getData() != null final Uri pictureUri = data != null && data.getData() != null
? data.getData() : mTakePictureUri; ? 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) { switch (requestCode) {
case REQUEST_CODE_CROP_PHOTO: case REQUEST_CODE_CROP_PHOTO:
onPhotoCropped(pictureUri, true); onPhotoCropped(pictureUri, true);