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

Merge Android 12 QPR3 ab/8391262

Browse Source 
Bug: 226662282
Merged-In: Ibb6451bfe343a8696cca9c4cfdb65cfab3f1ea0a
Change-Id: I08874ce0b74b20d356ade7da168a56ffb129ab48
This commit is contained in:
Xin Li
2022-04-01 20:32:45 +00:00
parent 5927d48424 004f20dc0c
commit 1ee3a18167
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.ContentType;
import com.android.messaging.util.LogUtil; import com.android.messaging.util.LogUtil;
import com.android.messaging.util.OsUtil; import com.android.messaging.util.OsUtil;
import com.android.messaging.util.UriUtil;
import java.io.ByteArrayOutputStream; import java.io.ByteArrayOutputStream;
import java.io.File; import java.io.File;
@@ -1018,8 +1019,7 @@ public class PduPersister {
String path = null; String path = null;
if (null != uri) { if (null != uri) {
final String scheme = uri.getScheme(); final String scheme = uri.getScheme();
if (null == scheme || scheme.equals("") || if (null == scheme || scheme.equals("") || UriUtil.isFileUri(uri)) {
scheme.equals(ContentResolver.SCHEME_FILE)) {
path = uri.getPath(); path = uri.getPath();
} else if (scheme.equals("http")) { } 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. // 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 // We're told it's possible to create world readable hardlinks to other apps private data
// so we ban all /data file uris. // so we ban all /data file uris.
public static boolean isInPrivateDir(Uri uri) { public static boolean isInPrivateDir(Uri uri) {
if (!isFileUri(uri)) { if (!UriUtil.isFileUri(uri)) {
return false; return false;
} }
final File file = new File(uri.getPath()); 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)) { if (MediaScratchFileProvider.isMediaScratchSpaceUri(mUri)) {
inputFilePath = MediaScratchFileProvider.getFileFromUri(mUri).getAbsolutePath(); inputFilePath = MediaScratchFileProvider.getFileFromUri(mUri).getAbsolutePath();
} else { } 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()); Assert.fail("Expected a GIF file uri, but actual uri = " + mUri.toString());
} }
inputFilePath = mUri.getPath(); inputFilePath = mUri.getPath();