commit 2299ba24e0a3fc8c580d83cde91b6eae42d765e6
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Thu Oct 07 23:12:43 2021 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Thu Oct 07 23:12:43 2021 +0000
tree 62e1d55b901f76bcbace161144501cdbf6017d71
parent b091e8fc67ff1672942b358e473d59eb892c8b1c
parent 92ce41890677fda24459627e86e9d19a0e39f78e

Snap for 7803374 from 92ce41890677fda24459627e86e9d19a0e39f78e to sc-v2-release

Change-Id: I6e6bfc5738e6e0d1e23ff3501553fb087d68e065

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