commit fb6c10a89f37c26e4fbcc4436bc419be637569a2
author Xin Li <delphij@google.com> Mon Dec 13 21:43:03 2021 -0800
committer Xin Li <delphij@google.com> Tue Dec 14 08:39:12 2021 -0800
tree c0f780d2e5e108f06de1c8d8e2cbd790c44783d6
parent 476671be4ae65e16ff5a6dbc1d91414d583f0cce
parent 6aa775678a12cf52aaac97621e41108891d0a387

Merge Android 12 QPR1

Bug: 210511427
Merged-In: Id864894b14fd0ab784a093ec203d31200c933f88
Change-Id: I1402358d4ef814caff2bb76bed71541c3a5ead64

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

diff --git a/src/com/android/messaging/util/UriUtil.java b/src/com/android/messaging/util/UriUtil.java
index d336167..1d6a1be 100644
--- a/src/com/android/messaging/util/UriUtil.java
+++ b/src/com/android/messaging/util/UriUtil.java
@@ -94,8 +94,12 @@
         return TextUtils.equals(scheme, ContentResolver.SCHEME_ANDROID_RESOURCE);
     }
 
+    /** Returns whether the given Uri is a file. */
     public static boolean isFileUri(final Uri uri) {
-        return uri != null && TextUtils.equals(uri.getScheme(), ContentResolver.SCHEME_FILE);
+        return uri != null &&
+                uri.getScheme() != null &&
+                TextUtils.equals(uri.getScheme().toLowerCase(),
+                        ContentResolver.SCHEME_FILE);
     }
 
     /**