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

Use UriUtil when checking if a URI is a file.

Browse Source 
UriUtil.isFileUri contains several additional fixes, so this ensure that existing instances where we check for the file scheme use this method as well. This covers all existing instances in the app of SCHEME_FILE.

Change-Id: I1f3131b33823eae3e620aa9608be8e72b2e84aa2
Bug: 215212561
This commit is contained in:
Jake Klinker
2022-01-31 20:21:06 +00:00
parent a0332cba4f
commit ebc64c5bae
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")) {