commit 9437a92c0c3d485ad7b882d22aff16bbbcb2d12e
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Fri Oct 08 01:07:53 2021 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Fri Oct 08 01:07:53 2021 +0000
tree 62e1d55b901f76bcbace161144501cdbf6017d71
parent 7f113e2a81ed81a3cabeb098fd27a0dcf6e557bb
parent 58ee29c68e1914af680ef0658bdb7a94e4e5e3a3

Snap for 7804438 from 58ee29c68e1914af680ef0658bdb7a94e4e5e3a3 to sc-qpr1-release

Change-Id: I0da1abbb52fb10ffe403473caeb77973ebdc6e90

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