Merge Android 12 QPR 3

Bug: 236045730
Merged-In: I4bdcc5893b6b437afa79f3bc138d1523c1d8431a
Change-Id: If485b9baf115a05eef5942859a54287233b3f171

src/com/android/messaging/mmslib/pdu/PduPersister.java

@@ -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("") ||
+            if (null == scheme || scheme.equals("") || UriUtil.isFileUri(uri)) {
-                    scheme.equals(ContentResolver.SCHEME_FILE)) {
                 path = uri.getPath();
 
             } else if (scheme.equals("http")) {

src/com/android/messaging/util/FileUtil.java

@@ -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());

src/com/android/messaging/util/ImageUtils.java

@@ -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();