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

Merge "Revert "Prevent exfiltration of system files via user image settings."" into qt-dev am: b9bafa0d3d am: 05031cc574 am: 03b1a52977

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19449016

Change-Id: I017c55ae2e7770bd52f1daca54e2aed7be05cb5e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Oli Lan
2022-08-22 15:21:18 +00:00
committed by Automerger Merge Worker
parent 25aa1f617d 03b1a52977
commit e2815b7e11
1 changed files with 13 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -21,7 +21,6 @@ import android.content.ClipData;
import android.content.ContentResolver; import android.content.ContentResolver;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.content.pm.ActivityInfo;
import android.content.pm.PackageManager; import android.content.pm.PackageManager;
import android.database.Cursor; import android.database.Cursor;
import android.graphics.Bitmap; import android.graphics.Bitmap;
@@ -79,7 +78,6 @@ public class EditUserPhotoController {
private static final int REQUEST_CODE_TAKE_PHOTO = 1002; private static final int REQUEST_CODE_TAKE_PHOTO = 1002;
private static final int REQUEST_CODE_CROP_PHOTO = 1003; private static final int REQUEST_CODE_CROP_PHOTO = 1003;
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 CROP_PICTURE_FILE_NAME = "CropEditUserPhoto.jpg";
private static final String TAKE_PICTURE_FILE_NAME = "TakeEditUserPhoto2.jpg"; private static final String TAKE_PICTURE_FILE_NAME = "TakeEditUserPhoto2.jpg";
private static final String NEW_USER_PHOTO_FILE_NAME = "NewUserPhoto.png"; private static final String NEW_USER_PHOTO_FILE_NAME = "NewUserPhoto.png";
@@ -90,7 +88,6 @@ public class EditUserPhotoController {
private final Fragment mFragment; private final Fragment mFragment;
private final ImageView mImageView; private final ImageView mImageView;
private final Uri mPreCropPictureUri;
private final Uri mCropPictureUri; private final Uri mCropPictureUri;
private final Uri mTakePictureUri; private final Uri mTakePictureUri;
@@ -102,8 +99,6 @@ public class EditUserPhotoController {
mContext = view.getContext(); mContext = view.getContext();
mFragment = fragment; mFragment = fragment;
mImageView = view; mImageView = view;
mPreCropPictureUri = createTempImageUri(mContext, PRE_CROP_PICTURE_FILE_NAME, !waiting);
mCropPictureUri = createTempImageUri(mContext, CROP_PICTURE_FILE_NAME, !waiting); mCropPictureUri = createTempImageUri(mContext, CROP_PICTURE_FILE_NAME, !waiting);
mTakePictureUri = createTempImageUri(mContext, TAKE_PICTURE_FILE_NAME, !waiting); mTakePictureUri = createTempImageUri(mContext, TAKE_PICTURE_FILE_NAME, !waiting);
mPhotoSize = getPhotoSize(mContext); mPhotoSize = getPhotoSize(mContext);
@@ -138,7 +133,7 @@ public class EditUserPhotoController {
case REQUEST_CODE_TAKE_PHOTO: case REQUEST_CODE_TAKE_PHOTO:
case REQUEST_CODE_CHOOSE_PHOTO: case REQUEST_CODE_CHOOSE_PHOTO:
if (mTakePictureUri.equals(pictureUri)) { if (mTakePictureUri.equals(pictureUri)) {
cropPhoto(pictureUri); cropPhoto();
} else { } else {
copyAndCropPhoto(pictureUri); copyAndCropPhoto(pictureUri);
} }
@@ -234,7 +229,7 @@ public class EditUserPhotoController {
protected Void doInBackground(Void... params) { protected Void doInBackground(Void... params) {
final ContentResolver cr = mContext.getContentResolver(); final ContentResolver cr = mContext.getContentResolver();
try (InputStream in = cr.openInputStream(pictureUri); try (InputStream in = cr.openInputStream(pictureUri);
OutputStream out = cr.openOutputStream(mPreCropPictureUri)) { OutputStream out = cr.openOutputStream(mTakePictureUri)) {
Streams.copy(in, out); Streams.copy(in, out);
} catch (IOException e) { } catch (IOException e) {
Log.w(TAG, "Failed to copy photo", e); Log.w(TAG, "Failed to copy photo", e);
@@ -245,38 +240,27 @@ public class EditUserPhotoController {
@Override @Override
protected void onPostExecute(Void result) { protected void onPostExecute(Void result) {
if (!mFragment.isAdded()) return; if (!mFragment.isAdded()) return;
cropPhoto(mPreCropPictureUri); cropPhoto();
} }
}.execute(); }.execute();
} }
private void cropPhoto(final Uri pictureUri) { private void cropPhoto() {
// TODO: Use a public intent, when there is one. // TODO: Use a public intent, when there is one.
Intent intent = new Intent("com.android.camera.action.CROP"); Intent intent = new Intent("com.android.camera.action.CROP");
intent.setDataAndType(pictureUri, "image/*"); intent.setDataAndType(mTakePictureUri, "image/*");
appendOutputExtra(intent, mCropPictureUri); appendOutputExtra(intent, mCropPictureUri);
appendCropExtras(intent); appendCropExtras(intent);
try { if (intent.resolveActivity(mContext.getPackageManager()) != null) {
StrictMode.disableDeathOnFileUriExposure(); try {
if (startSystemActivityForResult(intent, REQUEST_CODE_CROP_PHOTO)) { StrictMode.disableDeathOnFileUriExposure();
return; mFragment.startActivityForResult(intent, REQUEST_CODE_CROP_PHOTO);
} finally {
StrictMode.enableDeathOnFileUriExposure();
} }
} finally { } else {
StrictMode.enableDeathOnFileUriExposure(); onPhotoCropped(mTakePictureUri, false);
} }
onPhotoCropped(mTakePictureUri, false);
}
private boolean startSystemActivityForResult(Intent intent, int code) {
ActivityInfo info = intent.resolveActivityInfo(mContext.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);
mFragment.startActivityForResult(intent, code);
return true;
} }
private void appendOutputExtra(Intent intent, Uri pictureUri) { private void appendOutputExtra(Intent intent, Uri pictureUri) {