filab/packages_apps_Messaging
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[automerge] Use UriUtil when checking if a URI is a file. 2p: 27e27d944b

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

Bug: 215212561
Change-Id: I59e1aa0f1799fb1eb993bd4e1089b665d0965099
This commit is contained in:
Jake Klinker
2022-01-31 20:30:29 +00:00
committed by Presubmit Automerger Backend
parent 391770a376 27e27d944b
commit a3f2d65241
3 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/messaging/mmslib/pdu/PduPersister.java
View File

@@ -52,6 +52,7 @@ import com.android.messaging.util.Assert;
import com.android.messaging.util.ContentType;
import com.android.messaging.util.LogUtil;
import com.android.messaging.util.OsUtil;
import com.android.messaging.util.UriUtil;
import java.io.ByteArrayOutputStream;
import java.io.File;
@@ -1018,8 +1019,7 @@ public class PduPersister {
String path = null;
if (null != uri) {
final String scheme = uri.getScheme();
if (null == scheme || scheme.equals("") ||
scheme.equals(ContentResolver.SCHEME_FILE)) {
if (null == scheme || scheme.equals("") || UriUtil.isFileUri(uri)) {
path = uri.getPath();
} else if (scheme.equals("http")) {

6
src/com/android/messaging/util/FileUtil.java
View File

@@ -117,15 +117,11 @@ public class FileUtil {
}
}
private static boolean isFileUri(final Uri uri) {
return TextUtils.equals(uri.getScheme(), ContentResolver.SCHEME_FILE);
}
// Checks if the file is in /data, and don't allow any app to send personal information.
// We're told it's possible to create world readable hardlinks to other apps private data
// so we ban all /data file uris.
public static boolean isInPrivateDir(Uri uri) {
if (!isFileUri(uri)) {
if (!UriUtil.isFileUri(uri)) {
return false;
}
final File file = new File(uri.getPath());

2
src/com/android/messaging/util/ImageUtils.java
View File

@@ -480,7 +480,7 @@ public class ImageUtils {
if (MediaScratchFileProvider.isMediaScratchSpaceUri(mUri)) {
inputFilePath = MediaScratchFileProvider.getFileFromUri(mUri).getAbsolutePath();
} else {
if (!TextUtils.equals(mUri.getScheme(), ContentResolver.SCHEME_FILE)) {
if (!UriUtil.isFileUri(mUri)) {
Assert.fail("Expected a GIF file uri, but actual uri = " + mUri.toString());
}
inputFilePath = mUri.getPath();