commit 6aa775678a12cf52aaac97621e41108891d0a387
author Xin Li <delphij@google.com> Wed Nov 10 08:06:09 2021 +0000
committer Xin Li <delphij@google.com> Wed Nov 10 08:06:09 2021 +0000
tree c0f780d2e5e108f06de1c8d8e2cbd790c44783d6
parent 476671be4ae65e16ff5a6dbc1d91414d583f0cce
parent 8a9e12764a9f0b59f008b7524de3bfda4a94373d

Merge sc-qpr1-dev-plus-aosp-without-vendor@7810918

Bug: 205056467
Merged-In: I54b996561d0248a4636e0991545cbfc0700e1ee4
Change-Id: Id864894b14fd0ab784a093ec203d31200c933f88

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);
     }
 
     /**