drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Prevent exfiltration of system files via user image settings." into sc-dev am: be7735efcb am: 5b62c51502 am: 8c10a6aa0d

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17071224

Change-Id: I100fd497b19a8cad113c7d9320c1e64212502896
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
TreeHugger Robot 2022-04-01 15:25:20 +00:00 committed by Automerger Merge Worker
commit e35d11225a
1 changed files with 31 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
packages/SettingsLib/src/com/android/settingslib/users/EditUserPhotoController.java
View File

@ -21,6 +21,8 @@ import android.content.ClipData;
import android.content.ContentResolver;
import android.content.Context;
import android.content.Intent;
import android.content.pm.ActivityInfo;
import android.content.pm.PackageManager;
import android.database.Cursor;
import android.graphics.Bitmap;
import android.graphics.Bitmap.Config;
@ -83,6 +85,7 @@ public class EditUserPhotoController {
private static final int DEFAULT_PHOTO_SIZE = 500;
private static final String IMAGES_DIR = "multi_user";
private static final String PRE_CROP_PICTURE_FILE_NAME = "PreCropEditUserPhoto.jpg";
private static final String CROP_PICTURE_FILE_NAME = "CropEditUserPhoto.jpg";
private static final String TAKE_PICTURE_FILE_NAME = "TakeEditUserPhoto.jpg";
private static final String NEW_USER_PHOTO_FILE_NAME = "NewUserPhoto.png";
@ -95,6 +98,7 @@ public class EditUserPhotoController {
private final String mFileAuthority;
private final File mImagesDir;
private final Uri mPreCropPictureUri;
private final Uri mCropPictureUri;
private final Uri mTakePictureUri;
@ -110,6 +114,7 @@ public class EditUserPhotoController {
mImagesDir = new File(activity.getCacheDir(), IMAGES_DIR);
mImagesDir.mkdir();
mPreCropPictureUri = createTempImageUri(activity, PRE_CROP_PICTURE_FILE_NAME, !waiting);
mCropPictureUri = createTempImageUri(activity, CROP_PICTURE_FILE_NAME, !waiting);
mTakePictureUri = createTempImageUri(activity, TAKE_PICTURE_FILE_NAME, !waiting);
mPhotoSize = getPhotoSize(activity);
@ -143,7 +148,7 @@ public class EditUserPhotoController {
case REQUEST_CODE_CHOOSE_PHOTO:
if (mTakePictureUri.equals(pictureUri)) {
if (PhotoCapabilityUtils.canCropPhoto(mActivity)) {
cropPhoto();
cropPhoto(pictureUri);
} else {
onPhotoNotCropped(pictureUri);
}
@ -224,7 +229,7 @@ public class EditUserPhotoController {
protected Void doInBackground(Void... params) {
final ContentResolver cr = mActivity.getContentResolver();
try (InputStream in = cr.openInputStream(pictureUri);
OutputStream out = cr.openOutputStream(mTakePictureUri)) {
OutputStream out = cr.openOutputStream(mPreCropPictureUri)) {
Streams.copy(in, out);
} catch (IOException e) {
Log.w(TAG, "Failed to copy photo", e);
@ -235,28 +240,41 @@ public class EditUserPhotoController {
@Override
protected void onPostExecute(Void result) {
if (!mActivity.isFinishing() && !mActivity.isDestroyed()) {
cropPhoto();
cropPhoto(mPreCropPictureUri);
}
}
}.execute();
}
private void cropPhoto() {
private void cropPhoto(final Uri pictureUri) {
// TODO: Use a public intent, when there is one.
Intent intent = new Intent("com.android.camera.action.CROP");
intent.setDataAndType(mTakePictureUri, "image/*");
intent.setDataAndType(pictureUri, "image/*");
appendOutputExtra(intent, mCropPictureUri);
appendCropExtras(intent);
if (intent.resolveActivity(mActivity.getPackageManager()) != null) {
try {
StrictMode.disableDeathOnFileUriExposure();
mActivityStarter.startActivityForResult(intent, REQUEST_CODE_CROP_PHOTO);
} finally {
StrictMode.enableDeathOnFileUriExposure();
try {
StrictMode.disableDeathOnFileUriExposure();
if (startSystemActivityForResult(intent, REQUEST_CODE_CROP_PHOTO)) {
return;
}
} else {
onPhotoNotCropped(mTakePictureUri);
} finally {
StrictMode.enableDeathOnFileUriExposure();
}
onPhotoNotCropped(mTakePictureUri);
}
private boolean startSystemActivityForResult(Intent intent, int code) {
ActivityInfo info = intent.resolveActivityInfo(mActivity.getPackageManager(),
PackageManager.MATCH_SYSTEM_ONLY);
if (info == null) {
Log.w(TAG, "No system package activity could be found for code " + code);
return false;
}
intent.setPackage(info.packageName);
mActivityStarter.startActivityForResult(intent, code);
return true;
}
private void appendOutputExtra(Intent intent, Uri pictureUri) {